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

79 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kske
63b1809c90 Loading config from properties before command line args 2019-11-13 05:59:51 +01:00
DieGurke
0b5dbe59dc Merge pull request #22 from informatik-ag-ngl/f/sync 
Sync
 2019-11-09 18:08:50 +01:00
DieGurke
acb744a34d Revised merge conflict changes 2019-11-09 17:47:18 +01:00
DieGurke
c28f3e2e26 Merge branch 'develop' into f/sync 2019-11-09 17:23:15 +01:00
DieGurke
e1ef85d702 Edit syncTimeout property, made Config a singleton 2019-11-09 14:23:26 +01:00
DieGurke
cd8a92c619 Fixed reading messages 
Fixes #23
 2019-11-09 14:06:09 +01:00
CyB3RC0nN0R
42f3a97e8a Removed empty lines 2019-11-09 13:37:51 +01:00
CyB3RC0nN0R
4ff67c69a2 Fixed grammar 2019-11-09 13:35:17 +01:00
CyB3RC0nN0R
f69754d476 Removed unnecessary TODO item 2019-11-09 13:29:47 +01:00
DieGurke
6c212df309 Revised structure 2019-11-09 13:25:18 +01:00
delvh
493ec03ffb 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
b70dabb02f Improved ChatWindow according to CyB3RC0nN0Rs Feedback 2019-11-09 10:23:00 +01:00
CyB3RC0nN0R
d91fb6bf21 Update Client.java 2019-11-09 10:04:58 +01:00
delvh
b1733372a0 minor changes in ChatWindow and SettingsScreen 2019-11-09 09:52:27 +01:00
kske
c58a4a73d3 Extracted updateUserStates method, fixed localDB initialization 2019-11-09 09:38:10 +01:00
delvh
d9870f9b22 Added KeyListeners for sending the message and an automatic line break 2019-11-05 13:30:23 +01:00
Maxi
a0dc25ba61 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
0edd9d998f 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
CyB3RC0nN0R
239d2bb029 Merge pull request #20 from informatik-ag-ngl/f/local_db 
Added local database
 2019-10-30 17:02:18 +01:00
kske
f1b6869945 Fixed Javadoc formatting and spelling 2019-10-30 17:01:55 +01:00
delvh
043219135f Updated Javadoc for LocalDB File 2019-10-30 08:10:40 +01:00
delvh
236564c32d Updated Javadoc in Config File 2019-10-30 07:45:33 +01:00
CyB3RC0nN0R
f8ce1ee6d9 Merge branch 'develop' into f/local_db 2019-10-30 06:26:50 +01:00
kske
018753e115 Fixed formatting 2019-10-30 06:19:50 +01:00
kske
b88d4993ef Updated .gitignore to include localDB 2019-10-30 06:16:44 +01:00
kske
07dc11eebd Renamed ChatSynchronizer to LocalDB, added user-specific files 2019-10-27 21:40:40 +01:00
delvh
ab3a18d4df 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
kske
d2dbf91b8a Added ChatSynchronizer class to store chats locally 2019-10-27 17:25:58 +01:00
CyB3RC0nN0R
6f6388f595 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
kske
4147df262d Moved GET request implementations into a single method 2019-10-26 18:31:49 +02:00
kske
b7b4e95e65 Reduced the number of user list requests to one 
Fixes #16
 2019-10-26 17:49:45 +02:00
DieGurke
96e94c2254 Merge pull request #15 from informatik-ag-ngl/f/multiple_chats 
Fixed NullPointerException on empty date
 2019-10-26 11:23:02 +02:00
kske
5201eaa320 Fixed NullPointerException on empty date 2019-10-23 17:17:15 +02:00
DieGurke
67896a39ad Merge pull request #10 from informatik-ag-ngl/f/multiple_chats 
Implemented multiple chat system
 2019-10-23 16:02:04 +02:00
kske
bab984fb1f 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
kske
18a078475d Added HTML formatting to message list elements 2019-10-23 05:49:15 +02:00
Maxi
aeb138334e Requesting unread messages an assigning them to the right chat element. 2019-10-19 15:09:32 +02:00
kske
78f9f4c883 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
delvh
ea42bcc63b Formatted Chat file 
Formatted Getters and Setters
 2019-10-19 10:14:46 +02:00
Maxi
2761e178da Implemented multiple chat system 
* Local saving of these and displaying the partner name
* Added display of timestamp in chat.

Closes #9
 2019-10-19 09:59:45 +02:00
Maxi
2584c6b368 Merge branch 'develop' of https://github.com/informatik-ag-ngl/envoy-client.git into develop 2019-10-13 18:17:01 +02:00
DieGurke
a00a2748ae Merge pull request #7 from informatik-ag-ngl/f/startup 
senderID
 2019-10-13 18:06:57 +02:00
kske
f22c4fa9df Fixed formatting and Javadoc 
Closes #5
 2019-10-13 17:25:20 +02:00
Maxi
b9157ca992 Added the setting of the senderID in the xml. 2019-10-12 17:35:58 +02:00
Maxi
940e34fbc3 Merge branch 'f/startup' of https://github.com/informatik-ag-ngl/envoy-client.git into develop 2019-10-12 16:43:43 +02:00
delvh
d5dd076ce2 Added Startup class and login by username. 2019-10-12 14:45:58 +02:00
CyB3RC0nN0R
7e4ca8750c Merge pull request #6 from informatik-ag-ngl/f/javadoc 
Added Javadoc to config file.
 2019-10-12 13:13:07 +02:00
leon
3321ee01b1 Added Javadoc to Config file. 2019-10-12 11:52:29 +02:00
CyB3RC0nN0R
18be5a957a Merge pull request #4 from informatik-ag-ngl/f/config 
Renamed EnvoyClient to Client, added Config class
 2019-10-12 11:26:11 +02:00
kske
fe95e6bfb6 Renamed EnvoyClient to Client, added Config class 2019-10-12 11:19:29 +02:00