c5988731e1 
					 
					
						
						
							
							Re-added logging to LocalDB to resolve merge conflict  
						
						
						
						
					 
					
						2019-12-05 16:10:28 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d105c48c9e 
					 
					
						
						
							
							Creating message notifications only if ChatWindow has lost focus  
						
						... 
						
						
						
						StatusTray injects a WindowFocusListener into ChatWindow in its
constructor and does only react to received messages if ChatWindow has
currently lost focus. 
						
						
					 
					
						2019-12-05 15:42:20 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ca4369d60e 
					 
					
						
						
							
							Fixed Envoy logo loading for StatusTrayIcon  
						
						
						
						
					 
					
						2019-12-05 15:13:19 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						25181a1408 
					 
					
						
						
							
							Simplified and optimized sync related code in LocalDB  
						
						
						
						
					 
					
						2019-12-05 15:05:05 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cf6735f621 
					 
					
						
						
							
							Added Javadoc to event related classes and StatusTrayIcon  
						
						
						
						
					 
					
						2019-12-04 23:27:17 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e7b5eaa959 
					 
					
						
						
							
							Added message events, triggering message creation event  
						
						... 
						
						
						
						+ Abstract MessageEvent class with MessageCreationEvent and
MessageModificationEvent subclasses
+ Made StatusTrayIcon an event handler
- Fixed EventBus#getInstance not being static 
						
						
					 
					
						2019-12-04 22:26:24 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						761db20f5f 
					 
					
						
						
							
							Added StatusTrayIcon#displayMessageNotification method  
						
						... 
						
						
						
						Using this method, a message object can be displayed as a OS-specific
notification, which can be useful in the future to alert the user about
an incoming message while the application is not in focus. 
						
						
					 
					
						2019-12-04 18:52:48 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c70416df28 
					 
					
						
						
							
							Added event system  
						
						... 
						
						
						
						+ Event interface for defining event objects
+ EventHandler interface for defining event handlers
+ EventBus singleton class for managing event handlers and dispatching
events 
						
						
					 
					
						2019-12-04 18:50:06 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3d4b472afb 
					 
					
						
						
							
							Added a small popup menu to StatusTrayIcon and loading it in Startup  
						
						
						
						
					 
					
						2019-12-04 07:50:59 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8c9cddfa53 
					 
					
						
						
							
							Moved system tray logic to StatusTrayIcon class  
						
						
						
						
					 
					
						2019-12-03 21:48:16 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						652ca8d28b 
					 
					
						
						
							
							Added a test call to the system tray displaying a message  
						
						
						
						
					 
					
						2019-12-02 21:44:18 +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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d09432cecf 
					 
					
						
						
							
							Envoy Client v0.1-alpha  
						
						
						
						
					 
					
						2019-11-27 06:30:05 +01:00 
						 
				 
			
				
					
						
							
							
								delvh 
							
						 
					 
					
						
						
							
						
						ddc6e27abb 
					 
					
						
						
							
							Added settings object and light theme  
						
						... 
						
						
						
						Improvements:
* settings are implemented via Preferences API
* fixed "bug" that made partner name pane editable
* light theme is added as new display method 
						
						
					 
					
						2019-11-23 13:25:12 +01:00 
						 
				 
			
				
					
						
							
							
								delvh 
							
						 
					 
					
						
						
							
						
						85e31bc186 
					 
					
						
						
							
							Merge branch 'develop' into f/actual_settings  
						
						... 
						
						
						
						Conflicts:
	src/main/java/envoy/client/LocalDB.java
	src/main/java/envoy/client/ui/ChatWindow.java 
						
						
					 
					
						2019-11-23 09:20:54 +01:00 
						 
				 
			
				
					
						
							
							
								delvh 
							
						 
					 
					
						
						
							
						
						22a9fb7822 
					 
					
						
						
							
							improved Javadoc in some files, especially UIColors  
						
						
						
						
					 
					
						2019-11-22 22:40:00 +01:00 
						 
				 
			
				
					
						
							
							
								delvh 
							
						 
					 
					
						
						
							
						
						48b9176ac2 
					 
					
						
						
							
							Implemented settings object and cleaned up ChatWindow  
						
						... 
						
						
						
						Improvements:
* Settings were implemented
* Light theme support was implemented
* The readability of ChatWindow got improved 
						
						
					 
					
						2019-11-22 06:37:59 +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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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