Commit Graph

965 Commits

Author SHA1 Message Date
delvh
4d81b741bb Merge remote-tracking branch 'origin/develop' into f/enhanced_UI 2020-06-23 17:27:02 +02:00
0d7cb38b6d Apply suggestions from code review 2020-06-23 09:12:15 +02:00
74aceb91e4 Merge pull request #150 from informatik-ag-ngl/f/compatibility_verification
Shorten event names, compatibility verification
2020-06-23 06:47:46 +00:00
0bbade44a7 Merge branch 'develop' into f/compatibility_verification
Conflicts:
	src/main/java/envoy/client/net/Client.java
	src/main/java/envoy/client/net/MessageStatusChangeEventProcessor.java
	src/main/java/envoy/client/ui/Startup.java
	src/main/java/envoy/client/ui/controller/ChatScene.java
	src/main/java/envoy/client/ui/controller/ContactSearchScene.java
	src/main/java/envoy/client/ui/controller/GroupCreationScene.java
	src/main/java/envoy/client/ui/controller/LoginScene.java
2020-06-23 08:43:20 +02:00
d7e5a56902 Change envoy-common dependency back to the develop branch 2020-06-23 08:28:39 +02:00
30c14a7269 Merge pull request #23 from informatik-ag-ngl/f/compatibility_verification
LocalDateTime, short event names and compabitility verification support
2020-06-23 06:25:13 +00:00
6e262fc12f Add additional reasons to HandshakeRejection 2020-06-23 08:23:40 +02:00
delvh
df3edb72e1 Added a context menu to the message list and ability to copy a message
context menu contains a few menu items that will be populated with
functionality later on.
2020-06-22 22:51:10 +02:00
delvh
51b0e06e80 Added alignment and coloring of messages according to who is the sender
additionally added:
- the label on top of the ChatScene now displays the own users name
- the messageList now scrolls to the bottom when a message is
created/received
2020-06-22 20:53:44 +02:00
delvh
1387a3f81c Merge pull request #149 from informatik-ag-ngl/f/visually_pleasing_experience
Improved general appearance of Envoy, both in FXML and CSS
2020-06-21 17:40:57 +02:00
delvh
43d7f33ca0 Selected items will now be visually displayed 2020-06-21 17:36:08 +02:00
bb81ec6042 Move user status color to CSS, refactor ContactListCell 2020-06-21 17:25:24 +02:00
delvh
d389637259 Moved remainingCharsLabel styling from code to CSS 2020-06-21 17:04:27 +02:00
delvh
8b27857db1 Merge pull request #147 from informatik-ag-ngl/b/postbutton_bug_and_logging
Fixed postButton - bug and improved logging
2020-06-21 16:25:45 +02:00
2b3acf5238 Merge pull request #37 from informatik-ag-ngl/f/refactor_column_names
Fix JPA validator warnings with explicit column names
2020-06-21 07:15:12 +00:00
0ee639c63c Merge pull request #146 from informatik-ag-ngl/f/single_file_local_db
Store user specific local database information inside a single file
2020-06-21 07:12:23 +00:00
delvh
50ee56ba5a Fixed error caused by my own stupidity 2020-06-20 22:42:44 +02:00
delvh
d375bb8417 Apply suggestions from code review
Reworded the suggestions slightly
2020-06-20 22:29:32 +02:00
e9610b00ce Add simple version comparison algorithm 2020-06-20 14:38:06 +02:00
3660dec859 Shorten event names, refactor, prepare compatibility verification 2020-06-20 13:42:42 +02:00
e50078cc35 Shorten event names, compatibility verification 2020-06-20 11:00:58 +02:00
d5fc92527c Shorten event names 2020-06-20 10:51:40 +02:00
9193468213 Replace Date by LocalDateTime
Closes #22
2020-06-20 09:08:06 +02:00
delvh
5cb3de37ad Fixed incorrect logger statement
No one needs redundancy in a logging statement, right?

Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-19 17:07:33 +02:00
delvh
ef40c171d9 Fixed invisibility bug 2020-06-19 16:57:20 +02:00
bb6360d2a7 Add read-only clientVersion property to LoginCredentials
This is just a regular string that can be used to confirm the
compatibility between client and server.
2020-06-19 15:56:45 +02:00
delvh
f513480020 Improved general appearance of Envoy 2020-06-18 22:20:34 +02:00
13b4626737 Create CODEOWNERS 2020-06-15 12:17:56 +02:00
5bc88634da Create CODEOWNERS 2020-06-15 12:17:26 +02:00
6b204ca8db Create CODEOWNERS 2020-06-15 12:16:25 +02:00
872b71fbe9 Fix JPA validator warnings with explicit column names
Due to a bug in the JPA validator columns with camel case names are
flagged as missing (probably due to the case-insensitive nature of SQL).
This has been circumvented by assigning every column with a camel case
name a new name with underscores.

The inheritance strategy of the Contacts class has been changed to
single table for performance reasons.
2020-06-15 11:59:48 +02:00
83cec5c311 Merge pull request #36 from informatik-ag-ngl/f/groups
Group handling & groupMessage handling (unfinished)
2020-06-15 08:57:12 +02:00
07e84448c5 Some refactorings based on suggestions from @delvh 2020-06-14 16:40:51 +02:00
d9175721cc Apply suggestions from code review
Co-authored-by: delvh <dev.lh@web.de>
2020-06-14 16:30:46 +02:00
delvh
c162376589 Merge branch 'develop' into b/postbutton_bug_and_logging 2020-06-14 16:18:02 +02:00
delvh
092caaef9f Applying suggestions from code review 2 2020-06-14 16:11:46 +02:00
delvh
2653ec5fee Apply suggestions from code review
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-14 16:03:02 +02:00
eae3ed1cdb Merge pull request #145 from informatik-ag-ngl/f/read_status
Reading the current chat if it changes or a message is received
2020-06-14 14:18:44 +02:00
delvh
3960f955d8 Fixed multiple bugs concerning enterToSend and the postButton 2020-06-13 22:38:49 +02:00
delvh
9bf28acfcb Added improved logging capabilities 2020-06-13 22:36:52 +02:00
c87ab7c9e1 Store user specific local database information inside a single file
Closes #141
2020-06-13 18:46:41 +02:00
f7de07aca2 Make SerializationUtils#write variadic 2020-06-13 18:32:24 +02:00
ec923b5620 Reformat a logger statement
Co-authored-by: delvh <dev.lh@web.de>
2020-06-13 17:00:44 +02:00
delvh
b3c74562d7 Added sample log entry to visualize log formatting 2020-06-13 16:57:42 +02:00
DieGurke
2d92a3afcb Merge pull request #143 from informatik-ag-ngl/f/groups
Group Creation and working MessageStatus delivery (NO READ)
2020-06-13 14:44:28 +02:00
DieGurke
7a11b556d9 Added ReceivedGroupMessageProcessor
Receiving groupMessages works now properly(only if online)
2020-06-13 10:40:47 +02:00
DieGurke
8b53aab83a GroupMessages get processed the right way now 2020-06-12 23:53:40 +02:00
DieGurke
8826d0c3d3 Added support for sending groupMessages
* Implemented distinguishing between regular messages and groupMessages
when sending messages to the server (and sends the right object
obviously)
2020-06-12 23:50:52 +02:00
5f54fe6721 Change default logging level to finest, rename a class 2020-06-12 10:56:02 +02:00
6c7a80c708 Reading the current chat if it changes or a message is received
Closes #144
2020-06-12 10:54:55 +02:00