02baf70d92 
					 
					
						
						
							
							Fixed errors caused by preparing the merge into develop  
						
						 
						
						
						
						
					 
					
						2019-12-20 12:36:53 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						e8d15be940 
					 
					
						
						
							
							Merge branch 'develop' into f/logger  
						
						 
						
						
						
						
					 
					
						2019-12-20 12:30:53 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5614bdc314 
					 
					
						
						
							
							Added log directory to .gitignore  
						
						 
						
						
						
						
					 
					
						2019-12-20 12:01:09 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						55f90b7e6b 
					 
					
						
						
							
							Merge branch 'f/logger' of  
						
						 
						
						... 
						
						
						
						git@github.com:informatik-ag-ngl/envoy-client.git into f/logger
Conflicts:
	src/main/java/envoy/client/event/EnvoyLogger.java 
						
						
					 
					
						2019-12-20 12:00:44 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						88d2e42494 
					 
					
						
						
							
							Fixed Logger initialization  
						
						 
						
						... 
						
						
						
						Renamed EnvoyLogger to EnvoyLog and moved it to the newl< created
envoy.client.util package. 
						
						
					 
					
						2019-12-20 11:59:11 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						04618569a4 
					 
					
						
						
							
							Improved Javadoc slightly  
						
						 
						
						
						
						
					 
					
						2019-12-20 11:31:12 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d8cf751746 
					 
					
						
						
							
							Merge pull request  #54  from informatik-ag-ngl/f/scrollbar  
						
						 
						
						... 
						
						
						
						Enhanced Scroll Bar 
						
						
					 
					
						2019-12-18 22:14:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						500555c8db 
					 
					
						
						
							
							Added Javadoc requested by  @delvh  
						
						 
						
						
						
						
					 
					
						2019-12-18 22:07:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						7e02217002 
					 
					
						
						
							
							Updated EnvoyLogger -> still not working  
						
						 
						
						
						
						
					 
					
						2019-12-18 17:11:56 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						69153005cd 
					 
					
						
						
							
							Fixed vertical scroll bar drawing on 4K monitors  
						
						 
						
						
						
						
					 
					
						2019-12-17 08:17:22 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						396686bfdc 
					 
					
						
						
							
							Added ThemeChangeEvent, improved EventHandler declaration  
						
						 
						
						
						
						
					 
					
						2019-12-16 09:41:21 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						f6bd6ab754 
					 
					
						
						
							
							Formatting  
						
						 
						
						... 
						
						
						
						* Split applyTheme method in applyTheme and autoscroll.
* Added Javadoc 
						
						
					 
					
						2019-12-15 20:18:43 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						acc7424503 
					 
					
						
						
							
							Added PrimaryScrollPane class with default scroll pane UI settings  
						
						 
						
						
						
						
					 
					
						2019-12-15 17:44:13 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						adb5c417c5 
					 
					
						
						
							
							Improved code style and formatting  
						
						 
						
						
						
						
					 
					
						2019-12-15 16:26:11 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						4f777412f3 
					 
					
						
						
							
							Cold style improvement  
						
						 
						
						... 
						
						
						
						Changed if query with isVertical in PrimaryScrollBar to short form. 
						
						
					 
					
						2019-12-15 12:53:01 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						3fefeb1082 
					 
					
						
						
							
							Autoscroll  
						
						 
						
						... 
						
						
						
						* Implemented functionality to automatically scroll down when user is on
the bottom of the chat and then there are new messages added.
* When chat is opened, the vertical scroll bar starts at the bottom.
* When rereading messages, the chat doesn't scroll down if new messages
are added. (Besides see first point) 
						
						
					 
					
						2019-12-15 12:48:40 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						6bfa3c2b79 
					 
					
						
						
							
							Horizontal Scroll Bar  
						
						 
						
						... 
						
						
						
						Implemented primaryScrollBar support for horizontal scroll bar as well. 
						
						
					 
					
						2019-12-15 00:34:44 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						4a2d6f913b 
					 
					
						
						
							
							Custom scroll bar  
						
						 
						
						... 
						
						
						
						* Added PrimaryScrollBar class
* Implemented PrimaryScrollBar in ChatWindow for the ScrollPanes
vertical scroll bar 
						
						
					 
					
						2019-12-14 19:10:45 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						8267fa4d0d 
					 
					
						
						
							
							Implemented a (not working) own version of a logger  
						
						 
						
						... 
						
						
						
						and reformatted code 
						
						
					 
					
						2019-12-14 14:58:07 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						12b0cc1d0b 
					 
					
						
						
							
							Merge pull request  #53  from informatik-ag-ngl/f/background_execution  
						
						 
						
						... 
						
						
						
						Added background execution 
						
						
					 
					
						2019-12-14 14:30:19 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						88679ec515 
					 
					
						
						
							
							Merge pull request  #52  from informatik-ag-ngl/b/incorrect_color_change  
						
						 
						
						... 
						
						
						
						Fixed incorrect color changing 
						
						
					 
					
						2019-12-14 14:25:46 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f0353c8c72 
					 
					
						
						
							
							Added background execution  
						
						 
						
						
						
						
					 
					
						2019-12-14 14:17:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						049b2872db 
					 
					
						
						
							
							Merge branch 'develop' into b/incorrect_color_change  
						
						 
						
						
						
						
					 
					
						2019-12-14 14:03:02 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						6ae43fc810 
					 
					
						
						
							
							Merge pull request  #51  from informatik-ag-ngl/f/primaryComponents  
						
						 
						
						... 
						
						
						
						Added customized primary components 
						
						
					 
					
						2019-12-14 13:54:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						25eab59d7c 
					 
					
						
						
							
							Merge branch 'develop' into f/primaryComponents  
						
						 
						
						
						
						
					 
					
						2019-12-14 13:54:22 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						4d35129a67 
					 
					
						
						
							
							Formatted  
						
						 
						
						
						
						
					 
					
						2019-12-14 13:52:47 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						4ba1f6360c 
					 
					
						
						
							
							Revised code according to reviews by  @delvh  and @CyB3RC0nN0R  
						
						 
						
						
						
						
					 
					
						2019-12-14 13:46:19 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						05b2d7be7f 
					 
					
						
						
							
							Merge pull request  #49  from informatik-ag-ngl/f/offline_mode  
						
						 
						
						... 
						
						
						
						Added offline mode 
						
						
					 
					
						2019-12-14 13:29:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						a0e72a6e56 
					 
					
						
						
							
							Changed colors management in the displaying of the themes settings  
						
						 
						
						... 
						
						
						
						screen. 
						
						
					 
					
						2019-12-14 12:54:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ac7b7fa3d6 
					 
					
						
						
							
							Added documentation, refined exception handling  
						
						 
						
						
						
						
					 
					
						2019-12-14 11:30:00 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						89b75b00c8 
					 
					
						
						
							
							Fixes bugs with the incorrect applying of the changed colors.  
						
						 
						
						... 
						
						
						
						Fixes  #50  
						
						
					 
					
						2019-12-14 11:22:37 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0123935cea 
					 
					
						
						
							
							Not starting the sync thread in offline mode  
						
						 
						
						
						
						
					 
					
						2019-12-14 11:02:01 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ea3ad85611 
					 
					
						
						
							
							Implemented offline mode for Client and LocalDB  
						
						 
						
						
						
						
					 
					
						2019-12-14 10:53:20 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5b84578a0a 
					 
					
						
						
							
							Removed user id, name and email from Settings  
						
						 
						
						
						
						
					 
					
						2019-12-14 09:58:25 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2b1ece1c48 
					 
					
						
						
							
							Added user list serialization to LocalDB  
						
						 
						
						... 
						
						
						
						* Added user list to LocalDB
* Removed client user from LocalDB constructor 
						
						
					 
					
						2019-12-14 08:44:03 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e69deb9bd6 
					 
					
						
						
							
							Moved client.properties loading from Startup to Config  
						
						 
						
						
						
						
					 
					
						2019-12-13 08:50:15 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0f64ce0a01 
					 
					
						
						
							
							Added offline mode to Client  
						
						 
						
						... 
						
						
						
						+ Saving the user ID in Settings
+ Loading the user ID from Settings in Client if the server can't be
reached 
						
						
					 
					
						2019-12-11 18:52:30 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6525b1b026 
					 
					
						
						
							
							Merge pull request  #47  from informatik-ag-ngl/b/status_tray_linux  
						
						 
						
						... 
						
						
						
						Silent failure when StatusTrayIcon is not supported on a platform 
						
						
					 
					
						2019-12-09 07:40:18 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						ecf2566431 
					 
					
						
						
							
							Primary TextArea  
						
						 
						
						... 
						
						
						
						* Added PrimaryTextArea Class
* Implemented PrimaryTextArea in ChatWindow (messageEnterArea)
* Made some slight adjustments to the PrimaryButton Class 
						
						
					 
					
						2019-12-07 23:23:25 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						418a60c074 
					 
					
						
						
							
							Primary Button  
						
						 
						
						... 
						
						
						
						Took primaryButton class from corresponding branch.
Implemented constructors in ChatWindow. 
						
						
					 
					
						2019-12-07 22:48:12 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e7a567d7bb 
					 
					
						
						
							
							Silent failure when StatusTrayIcon is not supported on a platform  
						
						 
						
						
						
						
					 
					
						2019-12-07 21:14:55 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a387ec518e 
					 
					
						
						
							
							Merge pull request  #40  from informatik-ag-ngl/f/themes  
						
						 
						
						... 
						
						
						
						Added themes 
						
						
					 
					
						2019-12-07 21:06:18 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						ecfd3b17bf 
					 
					
						
						
							
							Revised requested changes besides 2 (please change by yourself)  
						
						 
						
						
						
						
					 
					
						2019-12-07 17:58:59 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						94dc68e2c5 
					 
					
						
						
							
							Fixed an indentation error in Javadoc  
						
						 
						
						
						
						
					 
					
						2019-12-07 14:54:03 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						6510c26ba2 
					 
					
						
						
							
							Merge branch 'develop' into f/themes  
						
						 
						
						
						
						
					 
					
						2019-12-07 14:50:20 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						6d29735534 
					 
					
						
						
							
							Create issue templates  
						
						 
						
						... 
						
						
						
						Now issues can be easily created using these templates 
						
						
					 
					
						2019-12-07 13:33:55 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						d36f3cc9dd 
					 
					
						
						
							
							Fixes themes list display bug and error when loading client with custom  
						
						 
						
						... 
						
						
						
						theme 
						
						
					 
					
						2019-12-07 13:31:08 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						d5e7b14bc6 
					 
					
						
						
							
							Create CODE_OF_CONDUCT.md  
						
						 
						
						
						
						
					 
					
						2019-12-07 13:25:39 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e99878a4e3 
					 
					
						
						
							
							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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b0b76984ea 
					 
					
						
						
							
							Added new Envoy logo designed by @DieGurke  
						
						 
						
						
						
						
					 
					
						2019-12-07 13:02:38 +01:00