Commit Graph

91 Commits

Author SHA1 Message Date
93f5c79a32
Merge pull request #32 from informatik-ag-ngl/f/logging
Added proper logging
2019-11-29 21:06:56 +01:00
delvh
f5845b1645
Merge branch 'develop' into f/logging 2019-11-29 21:04:44 +01:00
8696d4d3d9
Merge pull request #31 from informatik-ag-ngl/f/improved_config
Loading config from properties before command line args
2019-11-29 20:59:41 +01:00
delvh
b3befc3514
Deleted unnecessary blank line 2019-11-29 20:54:33 +01:00
delvh
f3078bf7f3
Fixed minor Javadoc errors 2019-11-29 20:48:21 +01:00
delvh
2ea35bd97c
Merge branch 'develop' into f/logging 2019-11-29 20:33:42 +01:00
derharry333
30d380857c Replaced print statements with logger statements. 2019-11-27 17:07:25 +01:00
DieGurke
b4fa0b9ae4
Merge pull request #28 from informatik-ag-ngl/b/message_synchronization
Fixed bugs related to message synchronization
2019-11-16 14:18:13 +01:00
delvh
5e4e1449d2
updated Javadoc 2019-11-16 14:16:27 +01:00
b657f2a516 Removed LocalDB#addWaitingMessageToLocalDB, fixed formatting 2019-11-16 10:47:32 +01:00
eadccd7126 Preventing sent messages from being added to the sync again
Fixed #25
2019-11-16 08:23:04 +01:00
73eb312a90 Mark all newly received messages in the current chat as read
Fixes #24
2019-11-16 08:06:07 +01:00
bbdf17d17b Loading config from properties before command line args 2019-11-13 05:59:51 +01:00
DieGurke
329339f05c
Merge pull request #22 from informatik-ag-ngl/f/sync
Sync
2019-11-09 18:08:50 +01:00
DieGurke
a76f1aa743 Revised merge conflict changes 2019-11-09 17:47:18 +01:00
DieGurke
29d1fc784b
Merge branch 'develop' into f/sync 2019-11-09 17:23:15 +01:00
DieGurke
a9b3224924 Edit syncTimeout property, made Config a singleton 2019-11-09 14:23:26 +01:00
DieGurke
817117905d Fixed reading messages
Fixes #23
2019-11-09 14:06:09 +01:00
8cc132eeb5
Removed empty lines 2019-11-09 13:37:51 +01:00
f0a72d5851
Fixed grammar 2019-11-09 13:35:17 +01:00
b8f05578fe
Removed unnecessary TODO item 2019-11-09 13:29:47 +01:00
DieGurke
52f2f8e1c2 Revised structure 2019-11-09 13:25:18 +01:00
delvh
938b77ebfe
Merge pull request #21 from informatik-ag-ngl/f/improved_UX
Added Settings screen template, line break and message sending on key combination
2019-11-09 10:26:37 +01:00
delvh
9c0be9cd9a Improved ChatWindow according to CyB3RC0nN0Rs Feedback 2019-11-09 10:23:00 +01:00
9c88e14d07
Update Client.java 2019-11-09 10:04:58 +01:00
delvh
59fc855364 minor changes in ChatWindow and SettingsScreen 2019-11-09 09:52:27 +01:00
67f9f5133f Extracted updateUserStates method, fixed localDB initialization 2019-11-09 09:38:10 +01:00
delvh
2d3d595164 Added KeyListeners for sending the message and an automatic line break 2019-11-05 13:30:23 +01:00
Maxi
ba0c588c77 Sync
* Completely revised communication between client and server.
* Added synchronization functionality.
* Added Message State updates
* Added UserStatus updates
2019-11-04 23:10:53 +01:00
delvh
4adc23d902 Added automatic line separation and Keylistener for posting
Improvements yet to be made (help wanted!):
* automatic line separation does not work
* automatic line separation needs a case for insertion of a String
* Keylistener for Posting does not work
* Method for listening to multiple keys needed (ctrl+enter)
* A template Settings screen was added, has yet to be polished
2019-10-31 22:11:50 +01:00
f5037916c9
Merge pull request #20 from informatik-ag-ngl/f/local_db
Added local database
2019-10-30 17:02:18 +01:00
316936a1f8 Fixed Javadoc formatting and spelling 2019-10-30 17:01:55 +01:00
delvh
d739f7a445
Updated Javadoc for LocalDB File 2019-10-30 08:10:40 +01:00
delvh
46521d8230
Updated Javadoc in Config File 2019-10-30 07:45:33 +01:00
09ae179728
Merge branch 'develop' into f/local_db 2019-10-30 06:26:50 +01:00
9108961522 Fixed formatting 2019-10-30 06:19:50 +01:00
57b3a57452 Updated .gitignore to include localDB 2019-10-30 06:16:44 +01:00
6e4b4e4d4e Renamed ChatSynchronizer to LocalDB, added user-specific files 2019-10-27 21:40:40 +01:00
delvh
16a3d32875 Updated Javadoc for the whole Repository
Aside from the files ChatWindow, Client and SettingsScreen, theirs is
already in my commit in f/settings
2019-10-27 20:23:36 +01:00
60c8b09b37 Added ChatSynchronizer class to store chats locally 2019-10-27 17:25:58 +01:00
e492933dcf
Merge pull request #17 from informatik-ag-ngl/b/user_load
Reduced the number of user list requests to one
2019-10-26 21:15:24 +02:00
b1467a5cc3 Moved GET request implementations into a single method 2019-10-26 18:31:49 +02:00
09b995ea0f Reduced the number of user list requests to one
Fixes #16
2019-10-26 17:49:45 +02:00
DieGurke
608f900681
Merge pull request #15 from informatik-ag-ngl/f/multiple_chats
Fixed NullPointerException on empty date
2019-10-26 11:23:02 +02:00
1ded9df82b Fixed NullPointerException on empty date 2019-10-23 17:17:15 +02:00
DieGurke
b2e1384532
Merge pull request #10 from informatik-ag-ngl/f/multiple_chats
Implemented multiple chat system
2019-10-23 16:02:04 +02:00
33d48515b9 Merge branch 'f/multiple_chats' of https://github.com/informatik-ag-ngl/envoy-client.git into f/multiple_chats 2019-10-23 05:49:27 +02:00
3916c14ab6 Added HTML formatting to message list elements 2019-10-23 05:49:15 +02:00
Maxi
0ed71e63a3 Requesting unread messages an assigning them to the right chat element. 2019-10-19 15:09:32 +02:00
8751bd8781 Changed message list to use JLabels as elements
* Using JLabel as message list element
* Managing sender and recipient in Client
* Reduced amount of ReST requests
2019-10-19 12:10:52 +02:00