Commit Graph

965 Commits

Author SHA1 Message Date
delvh
e347c2fae1 Merge remote-tracking branch 'origin/develop' into f/enhanced_UI 2020-06-23 17:27:02 +02:00
23de611355 Apply suggestions from code review 2020-06-23 09:12:15 +02:00
89539c3b93
Merge pull request #150 from informatik-ag-ngl/f/compatibility_verification
Shorten event names, compatibility verification
2020-06-23 06:47:46 +00:00
743a7a1c34 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
2e844ea688 Change envoy-common dependency back to the develop branch 2020-06-23 08:28:39 +02:00
58c6861f2c
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
416ce21d42 Add additional reasons to HandshakeRejection 2020-06-23 08:23:40 +02:00
delvh
d47a99d637 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
9e886c3f45 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
6eb91244cc
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
19fe3a2830 Selected items will now be visually displayed 2020-06-21 17:36:08 +02:00
256a5ac210 Move user status color to CSS, refactor ContactListCell 2020-06-21 17:25:24 +02:00
delvh
b23ee61506 Moved remainingCharsLabel styling from code to CSS 2020-06-21 17:04:27 +02:00
delvh
e6745da7d8
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
cd38f116aa
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
c916c3c22c
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
f073b6e397
Fixed error caused by my own stupidity 2020-06-20 22:42:44 +02:00
delvh
549198f242
Apply suggestions from code review
Reworded the suggestions slightly
2020-06-20 22:29:32 +02:00
d8d0d2f66a Add simple version comparison algorithm 2020-06-20 14:38:06 +02:00
e1775245b0 Shorten event names, refactor, prepare compatibility verification 2020-06-20 13:42:42 +02:00
0b28424bd4 Shorten event names, compatibility verification 2020-06-20 11:00:58 +02:00
434d364d79 Shorten event names 2020-06-20 10:51:40 +02:00
41a507057b Replace Date by LocalDateTime
Closes #22
2020-06-20 09:08:06 +02:00
delvh
dda9e8ee25 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
d20d72f6e2 Fixed invisibility bug 2020-06-19 16:57:20 +02:00
5c784bfdc6 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
cfd323725f Improved general appearance of Envoy 2020-06-18 22:20:34 +02:00
837ee71a94
Create CODEOWNERS 2020-06-15 12:17:56 +02:00
71fb1c93b1
Create CODEOWNERS 2020-06-15 12:17:26 +02:00
b1aeab06d1
Create CODEOWNERS 2020-06-15 12:16:25 +02:00
6b34bf9edc 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
071d715674
Merge pull request #36 from informatik-ag-ngl/f/groups
Group handling & groupMessage handling (unfinished)
2020-06-15 08:57:12 +02:00
a1cfd728a5 Some refactorings based on suggestions from @delvh 2020-06-14 16:40:51 +02:00
f1c49f0b95
Apply suggestions from code review
Co-authored-by: delvh <dev.lh@web.de>
2020-06-14 16:30:46 +02:00
delvh
b8f0bba8a7
Merge branch 'develop' into b/postbutton_bug_and_logging 2020-06-14 16:18:02 +02:00
delvh
7744d382b1 Applying suggestions from code review 2 2020-06-14 16:11:46 +02:00
delvh
4071487048
Apply suggestions from code review
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-14 16:03:02 +02:00
db38d6f609
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
6dda2cce71 Fixed multiple bugs concerning enterToSend and the postButton 2020-06-13 22:38:49 +02:00
delvh
753791e8c9 Added improved logging capabilities 2020-06-13 22:36:52 +02:00
deff9d642b Store user specific local database information inside a single file
Closes #141
2020-06-13 18:46:41 +02:00
4daaa5f4da Make SerializationUtils#write variadic 2020-06-13 18:32:24 +02:00
2a26ce0cad
Reformat a logger statement
Co-authored-by: delvh <dev.lh@web.de>
2020-06-13 17:00:44 +02:00
delvh
9123e32e49 Added sample log entry to visualize log formatting 2020-06-13 16:57:42 +02:00
DieGurke
2261e3713c
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
a8b35418d3 Added ReceivedGroupMessageProcessor
Receiving groupMessages works now properly(only if online)
2020-06-13 10:40:47 +02:00
DieGurke
fbed3072ee GroupMessages get processed the right way now 2020-06-12 23:53:40 +02:00
DieGurke
ee79ef1c66 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
a9de00371d Change default logging level to finest, rename a class 2020-06-12 10:56:02 +02:00
02ca6960f7 Reading the current chat if it changes or a message is received
Closes #144
2020-06-12 10:54:55 +02:00