delvh 
							
						 
					 
					
						
						
							
						
						b74eaf199e 
					 
					
						
						
							
							Create CODE_OF_CONDUCT.md  
						
						 
						
						
						
						
					 
					
						2019-12-07 13:25:39 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a61f116d7d 
					 
					
						
						
							
							Merge pull request  #38  from informatik-ag-ngl/f/logo  
						
						 
						
						... 
						
						
						
						Added new Envoy logo designed by @DieGurke 
						
						
					 
					
						2019-12-07 13:08:10 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6f7bee4509 
					 
					
						
						
							
							Added new Envoy logo designed by @DieGurke  
						
						 
						
						
						
						
					 
					
						2019-12-07 13:02:38 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						78be2e01a7 
					 
					
						
						
							
							Implemented theme serialization to a file  
						
						 
						
						
						
						
					 
					
						2019-12-07 11:48:41 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						381bc6b334 
					 
					
						
						
							
							Merge pull request  #37  from informatik-ag-ngl/f/logger  
						
						 
						
						... 
						
						
						
						Improved logging and code readability 
						
						
					 
					
						2019-12-07 11:31:18 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						9adc2d6289 
					 
					
						
						
							
							Merge branch 'develop' into f/logger  
						
						 
						
						
						
						
					 
					
						2019-12-07 11:22:47 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						860d2b0dcf 
					 
					
						
						
							
							Themes & Themes Configuration  
						
						 
						
						... 
						
						
						
						Added themes to choose from and provides customization setting for
these. 
						
						
					 
					
						2019-12-07 10:58:03 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						354f46d0cf 
					 
					
						
						
							
							Improved logging and code readability  
						
						 
						
						
						
						
					 
					
						2019-12-07 10:44:25 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						771a635888 
					 
					
						
						
							
							Merge pull request  #36  from informatik-ag-ngl/f/message_notification  
						
						 
						
						... 
						
						
						
						Implemented event system and status tray icon 
						
						
					 
					
						2019-12-07 09:54:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f7bb3e6789 
					 
					
						
						
							
							Implemented changes requested by  @delvh  
						
						 
						
						
						
						
					 
					
						2019-12-07 09:53:55 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d715474498 
					 
					
						
						
							
							Merge pull request  #35  from informatik-ag-ngl/c/project_natures  
						
						 
						
						... 
						
						
						
						Removed unnecessary JBoss project natures from .project 
						
						
					 
					
						2019-12-06 19:15:41 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8ca2bc0fd8 
					 
					
						
						
							
							Fix merge conflict  
						
						 
						
						
						
						
					 
					
						2019-12-05 16:20:18 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						eaa1e4e1ae 
					 
					
						
						
							
							Javadoc fixes and using superclass when injecting WindowFocusListener  
						
						 
						
						
						
						
					 
					
						2019-12-05 16:17:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bfa6455e16 
					 
					
						
						
							
							Merge branch 'develop' into f/message_notification  
						
						 
						
						
						
						
					 
					
						2019-12-05 16:11:28 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						abc41a9b63 
					 
					
						
						
							
							Removed unnecessary project natures in .project  
						
						 
						
						
						
						
					 
					
						2019-12-04 22:01:05 +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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						16b935ca92 
					 
					
						
						
							
							Removed unused project natures from .project  
						
						 
						
						
						
						
					 
					
						2019-12-04 18:46:49 +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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						06f2cdb028 
					 
					
						
						
							
							Merge pull request  #2  from informatik-ag-ngl/f/sync  
						
						 
						
						... 
						
						
						
						Sync 
						
						
					 
					
						2019-11-09 14:57:48 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						a9b3224924 
					 
					
						
						
							
							Edit syncTimeout property, made Config a singleton  
						
						 
						
						
						
						
					 
					
						2019-11-09 14:23:26 +01:00