zdm/envoy
zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity
486 Commits 2 Branches 2 Tags 3.5 MiB
4d81b741bb
Commit Graph

486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
delvh
4d81b741bb Merge remote-tracking branch 'origin/develop' into f/enhanced_UI 2020-06-23 17:27:02 +02:00
CyB3RC0nN0R
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
kske
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
kske
d7e5a56902 Change envoy-common dependency back to the develop branch 2020-06-23 08:28:39 +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
kske
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
CyB3RC0nN0R
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
kske
e50078cc35 Shorten event names, compatibility verification 2020-06-20 11:00:58 +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
delvh
f513480020 Improved general appearance of Envoy 2020-06-18 22:20:34 +02:00
CyB3RC0nN0R
6b204ca8db Create CODEOWNERS 2020-06-15 12:16:25 +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
CyB3RC0nN0R
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
kske
c87ab7c9e1 Store user specific local database information inside a single file 
Closes #141
 2020-06-13 18:46:41 +02:00
CyB3RC0nN0R
ec923b5620 Reformat a logger statement 
Co-authored-by: delvh <dev.lh@web.de>
 2020-06-13 17:00:44 +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
kske
6c7a80c708 Reading the current chat if it changes or a message is received 
Closes #144
 2020-06-12 10:54:55 +02:00
DieGurke
1a8c7dcfea 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
DieGurke
97d58f70f5 Adjusted pom.xml 2020-06-11 13:39:38 +02:00
DieGurke
7025cabd2f Fixed issue reagarding missing chats 2020-06-11 13:21:16 +02:00
DieGurke
c2a627529a 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
DieGurke
3439aee112 Merged branch 'develop' into f/groups 
Contains several bug fixes
 2020-06-10 22:23:59 +02:00
CyB3RC0nN0R
3db0676946 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
CyB3RC0nN0R
3ed0907b4f 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
kske
f876f4e05c Add received messages to their chat 2020-06-10 13:05:44 +02:00
kske
d14cc47365 Properly override updateItem method of list cells 2020-06-10 11:33:49 +02:00
kske
8a3ffec859 Replace UserStatusChangeProcessor with inline code in ChatScene 2020-06-10 11:22:36 +02:00
kske
c228519d4b Adjust stage size after changing the scene 2020-06-10 10:05:25 +02:00
CyB3RC0nN0R
30567ed1ef Merge pull request #136 from informatik-ag-ngl/f/javafx 
Replaced Swing with JavaFX
 2020-06-09 20:25:49 +00:00
delvh
d6e12df076 Fixed visual issues as per @delvh 's request 2020-06-09 22:24:09 +02:00
DieGurke
54bbed4a54 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
delvh
3e0b73ef12 Added (currently useless) comboBox to change your status 2020-06-09 21:03:19 +02:00
delvh
77f3db0ba3 Added color display of user statuses 2020-06-09 20:42:17 +02:00
delvh
9a6214eb82 Fixed bug automatically sending a message when ctrl is being pressed 2020-06-09 17:11:17 +02:00
kske
fc4fb4cdae Process ContactOperationEvent 2020-06-09 17:06:40 +02:00
kske
4835cc68fb Rename UserListCell to ContactListCell 2020-06-09 15:49:11 +02:00
kske
3d71cda884 Ask user before adding a contact 2020-06-09 15:41:01 +02:00
kske
bec49ff9e8 Implemented contact removal operation (untested) 2020-06-09 14:21:11 +02:00