Commit Graph

484 Commits

Author SHA1 Message Date
cde91a77ef Stop clearing password fields, remove prompt text 2020-06-25 07:49:45 +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
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
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
b23ee61506 Moved remainingCharsLabel styling from code to CSS 2020-06-21 17:04:27 +02:00
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
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
f073b6e397 Fixed error caused by my own stupidity 2020-06-20 22:42:44 +02:00
549198f242 Apply suggestions from code review
Reworded the suggestions slightly
2020-06-20 22:29:32 +02:00
0b28424bd4 Shorten event names, compatibility verification 2020-06-20 11:00:58 +02:00
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
d20d72f6e2 Fixed invisibility bug 2020-06-19 16:57:20 +02:00
cfd323725f Improved general appearance of Envoy 2020-06-18 22:20:34 +02:00
b1aeab06d1 Create CODEOWNERS 2020-06-15 12:16:25 +02:00
b8f0bba8a7 Merge branch 'develop' into b/postbutton_bug_and_logging 2020-06-14 16:18:02 +02:00
7744d382b1 Applying suggestions from code review 2 2020-06-14 16:11:46 +02:00
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
6dda2cce71 Fixed multiple bugs concerning enterToSend and the postButton 2020-06-13 22:38:49 +02:00
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
2a26ce0cad Reformat a logger statement
Co-authored-by: delvh <dev.lh@web.de>
2020-06-13 17:00:44 +02:00
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
02ca6960f7 Reading the current chat if it changes or a message is received
Closes #144
2020-06-12 10:54:55 +02:00
40a38e77dd Update src/main/java/envoy/client/ui/controller/GroupCreationScene.java
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-11 15:06:59 +02:00
02d0917967 Adjusted pom.xml 2020-06-11 13:39:38 +02:00
5466602a33 Fixed issue reagarding missing chats 2020-06-11 13:21:16 +02:00
b8e001bf54 MessageStatusChangeEventCache
Added a cache storing all messageStatusChangeEvents received during
handshake just like the already existing cache for received messages
during the handshake
This new cache is needed because the functionality regarding the pending
messages (and now messageStatusChanges as well) has changed!
2020-06-10 22:50:09 +02:00
4e2e47600b Merged branch 'develop' into f/groups
Contains several bug fixes
2020-06-10 22:23:59 +02:00
71cc69f4be Merge pull request #142 from informatik-ag-ngl/b/message_sync
Add received messages to their chat
2020-06-10 18:25:58 +00:00
1c8da42fe0 Merge pull request #140 from informatik-ag-ngl/b/ui_misc
Fix wrong stage size after scene switch and user list artifacts
2020-06-10 17:14:14 +00:00
c839ef01ba Add received messages to their chat 2020-06-10 13:05:44 +02:00
9dade2cf77 Properly override updateItem method of list cells 2020-06-10 11:33:49 +02:00
367a690dc8 Replace UserStatusChangeProcessor with inline code in ChatScene 2020-06-10 11:22:36 +02:00
46f8b1e767 Adjust stage size after changing the scene 2020-06-10 10:05:25 +02:00
b068796f46 Merge pull request #136 from informatik-ag-ngl/f/javafx
Replaced Swing with JavaFX
2020-06-09 20:25:49 +00:00
8ba718f7b1 Fixed visual issues as per @delvh 's request 2020-06-09 22:24:09 +02:00
a4cc753d85 Added Group Creation Functionality
* Implemented new group creation scene (fxml)
* Added group creation controller
* Adjusted contact search scene (fxml)
2020-06-09 21:22:45 +02:00
b953586859 Added (currently useless) comboBox to change your status 2020-06-09 21:03:19 +02:00
d0d86fc0d4 Added color display of user statuses 2020-06-09 20:42:17 +02:00
0661838c38 Fixed bug automatically sending a message when ctrl is being pressed 2020-06-09 17:11:17 +02:00
ebb7a48e8e Process ContactOperationEvent 2020-06-09 17:06:40 +02:00
0efd57f2ef Rename UserListCell to ContactListCell 2020-06-09 15:49:11 +02:00
bc17203367 Ask user before adding a contact 2020-06-09 15:41:01 +02:00
d03bbb6f5e Implemented contact removal operation (untested) 2020-06-09 14:21:11 +02:00
72354b3678 Fix user list in offline mode 2020-06-09 14:12:27 +02:00
7f6f538849 Display message date and status 2020-06-09 11:36:38 +02:00