79cb8e821c 
					 
					
						
						
							
							Merge remote-tracking branch 'common/develop' into develop  
						
						 
						
						
						
						
					 
					
						2020-07-13 11:40:56 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						40dbc8152a 
					 
					
						
						
							
							Move Envoy Server Standalone to server/ subdirectory  
						
						 
						
						
						
						
					 
					
						2020-07-13 11:40:00 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ddbab84700 
					 
					
						
						
							
							Merge remote-tracking branch 'server/develop' into develop  
						
						 
						
						
						
						
					 
					
						2020-07-13 11:38:42 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0309d0d860 
					 
					
						
						
							
							Move Envoy Client to client/ subdirectory  
						
						 
						
						
						
						
					 
					
						2020-07-13 11:37:45 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0c4d807e41 
					 
					
						
						
							
							Merge remote-tracking branch 'client/develop' into develop  
						
						 
						
						
						
						
					 
					
						2020-07-13 11:33:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4ea3c8aa67 
					 
					
						
						
							
							Initial commit  
						
						 
						
						
						
						
					 
					
						2020-07-13 11:30:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						540dad79eb 
					 
					
						
						
							
							Merge pull request  #186  from informatik-ag-ngl/f/displayUnreadMessages  
						
						 
						
						... 
						
						
						
						Displaying unread messages amount 
						
						
					 
					
						2020-07-13 09:02:44 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2901d52a31 
					 
					
						
						
							
							Remove unnecessary empty line  
						
						 
						
						... 
						
						
						
						Co-authored-by: delvh <dev.lh@web.de > 
						
						
					 
					
						2020-07-13 08:47:44 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						64f7ae4071 
					 
					
						
						
							
							Did some renaming  
						
						 
						
						
						
						
					 
					
						2020-07-12 17:10:22 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						7d47c9247d 
					 
					
						
						
							
							Apply suggestions from code review  
						
						 
						
						... 
						
						
						
						Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com > 
						
						
					 
					
						2020-07-12 16:27:20 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						780f52640b 
					 
					
						
						
							
							Removed unnecessary userList refreshing  
						
						 
						
						
						
						
					 
					
						2020-07-12 14:54:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						95cead4dee 
					 
					
						
						
							
							Adjusted ChatControl constructor and added Javadoc  
						
						 
						
						
						
						
					 
					
						2020-07-12 14:46:35 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						a6efe7cd9b 
					 
					
						
						
							
							Implemented good suggestion by  @delvh  regarding performance increase  
						
						 
						
						
						
						
					 
					
						2020-07-12 14:34:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						4b3fa65822 
					 
					
						
						
							
							Implemented some suggestions made by  @delvh  
						
						 
						
						
						
						
					 
					
						2020-07-12 13:07:46 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7eefaa3556 
					 
					
						
						
							
							Merge pull request  #187  from informatik-ag-ngl/f/do_a_barrel_roll  
						
						 
						
						... 
						
						
						
						implemented "DO A BARREL ROLL!" - Easteregg 
						
						
					 
					
						2020-07-12 09:52:14 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						ebca09ed2b 
					 
					
						
						
							
							Tweaked random parameters a bit  
						
						 
						
						
						
						
					 
					
						2020-07-11 21:45:54 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						f0c5faf352 
					 
					
						
						
							
							implemented "DO A BARREL ROLL!" - Easteregg  
						
						 
						
						
						
						
					 
					
						2020-07-11 15:23:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						0b0b240fb1 
					 
					
						
						
							
							When opening a chat holding unread messages, it scrolls to the first one  
						
						 
						
						
						
						
					 
					
						2020-07-11 14:57:15 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						0cebaeacb5 
					 
					
						
						
							
							Little Bug Fix  
						
						 
						
						
						
						
					 
					
						2020-07-11 14:46:13 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						ba4fdbe2f4 
					 
					
						
						
							
							chats with most recent messages get moved to the top  
						
						 
						
						
						
						
					 
					
						2020-07-11 14:18:38 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						d6dca1efe0 
					 
					
						
						
							
							Merge branch 'develop' into f/display_unread_messages  
						
						 
						
						
						
						
					 
					
						2020-07-11 10:59:23 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						faea75dcb1 
					 
					
						
						
							
							UI isn't shown if there arn't any unread messages  
						
						 
						
						
						
						
					 
					
						2020-07-11 10:46:17 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						d675349c71 
					 
					
						
						
							
							Implemented nice UI  
						
						 
						
						
						
						
					 
					
						2020-07-11 10:40:42 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						408ac53777 
					 
					
						
						
							
							Merge pull request  #183  from informatik-ag-ngl/f/pictures  
						
						 
						
						... 
						
						
						
						Add attachment creation support, display picture messages 
						
						
					 
					
						2020-07-11 08:01:23 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						32b832f51a 
					 
					
						
						
							
							Merge pull request  #49  from informatik-ag-ngl/f/password_in_login_credentials  
						
						 
						
						... 
						
						
						
						Add strong salted password hashing using PBKDF2 
						
						
					 
					
						2020-07-11 07:26:16 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1f44d03934 
					 
					
						
						
							
							Add strong salted password hashing using PBKDF2  
						
						 
						
						
						
						
					 
					
						2020-07-11 09:25:42 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1c3d4baf06 
					 
					
						
						
							
							Merge pull request  #181  from informatik-ag-ngl/f/password_in_login_credentials  
						
						 
						
						... 
						
						
						
						Adjust to new LoginCredentials API 
						
						
					 
					
						2020-07-11 07:24:47 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7f23adae1b 
					 
					
						
						
							
							Merge branch 'develop' into f/password_in_login_credentials  
						
						 
						
						
						
						
					 
					
						2020-07-11 09:21:49 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f12cc25b43 
					 
					
						
						
							
							Merge pull request  #30  from informatik-ag-ngl/f/password_in_login_credentials  
						
						 
						
						... 
						
						
						
						Store password instead of password hash in LoginCredentials 
						
						
					 
					
						2020-07-11 07:14:12 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						70da595a49 
					 
					
						
						
							
							UnreadMessagesAmount gets displayed correctly now (despite refresh bug)  
						
						 
						
						
						
						
					 
					
						2020-07-10 23:25:55 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						de136294af 
					 
					
						
						
							
							Fix Javadoc typo  
						
						 
						
						... 
						
						
						
						Co-authored-by: delvh <dev.lh@web.de > 
						
						
					 
					
						2020-07-10 21:05:57 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						1f7e5e5a3a 
					 
					
						
						
							
							Added getUnreadAmount function and changed ContactListCellFac' constr.  
						
						 
						
						
						
						
					 
					
						2020-07-10 22:41:59 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						63ea7a39c1 
					 
					
						
						
							
							Added image preview when an image is used as attachment  
						
						 
						
						... 
						
						
						
						additionally:
- added search icons
- solved problem of Scrollbars being shown too far from the right side
(all praise FX, Swing did not offer such a simple solution)
- relocated infoLabel into the highest row, is now located above the
messageList 
						
						
					 
					
						2020-07-10 20:53:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						ee4f6e01f4 
					 
					
						
						
							
							Added maximum size for displaying sent images  
						
						 
						
						... 
						
						
						
						additionally:
- made selecting of bmp or gif images possible
- defined a DEFAULT_ICON_SIZE in which most icons are loaded
- displayed attachment button with attachment icon 
						
						
					 
					
						2020-07-09 22:47:29 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d4b3d11d33 
					 
					
						
						
							
							Merge pull request  #182  from informatik-ag-ngl/f/cache_map  
						
						 
						
						... 
						
						
						
						Add CacheMap 
						
						
					 
					
						2020-07-09 18:12:20 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e67665f0bd 
					 
					
						
						
							
							Add attachment creation support, display picture messages  
						
						 
						
						
						
						
					 
					
						2020-07-09 16:16:06 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5d71ae5910 
					 
					
						
						
							
							Improve a comment  
						
						 
						
						... 
						
						
						
						Co-authored-by: delvh <dev.lh@web.de > 
						
						
					 
					
						2020-07-09 14:07:34 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						900304c250 
					 
					
						
						
							
							Fix hideous timing bug  
						
						 
						
						
						
						
					 
					
						2020-07-09 15:18:06 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						76536ed279 
					 
					
						
						
							
							Add subclass consumption for Cache with CacheMap#getApplicable  
						
						 
						
						
						
						
					 
					
						2020-07-09 10:53:27 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9c19d544d6 
					 
					
						
						
							
							Simplify cache storage with a CacheMap class  
						
						 
						
						
						
						
					 
					
						2020-07-09 09:37:31 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b6840a99ce 
					 
					
						
						
							
							Adjust to new LoginCredentials API  
						
						 
						
						
						
						
					 
					
						2020-07-09 09:13:26 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						4f654cc2a5 
					 
					
						
						
							
							Current working status  
						
						 
						
						
						
						
					 
					
						2020-07-09 09:12:41 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						7c5cc2f220 
					 
					
						
						
							
							Merge pull request  #180  from informatik-ag-ngl/f/context_menu  
						
						 
						
						... 
						
						
						
						Added context menu in MessageControl 
						
						
					 
					
						2020-07-08 22:08:53 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						793d388649 
					 
					
						
						
							
							For the first time DELETED Javadoc  
						
						 
						
						... 
						
						
						
						Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com > 
						
						
					 
					
						2020-07-08 21:46:44 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								delvh 
							
						 
					 
					
						
						
							
						
						0cdaca1f54 
					 
					
						
						
							
							Added context menu in MessageControl  
						
						 
						
						
						
						
					 
					
						2020-07-08 21:31:02 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						96e413c0b4 
					 
					
						
						
							
							Merge pull request  #46  from informatik-ag-ngl/f/groupMessages  
						
						 
						
						... 
						
						
						
						Group Messages 
						
						
					 
					
						2020-07-08 19:16:45 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4b33926a36 
					 
					
						
						
							
							Merge pull request  #174  from informatik-ag-ngl/f/groupMessages  
						
						 
						
						... 
						
						
						
						Group Messages 
						
						
					 
					
						2020-07-08 19:15:55 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						a8443e6a50 
					 
					
						
						
							
							Applied suggestions from  @delvh  
						
						 
						
						
						
						
					 
					
						2020-07-08 14:15:44 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						8ab8bbb0d4 
					 
					
						
						
							
							Extracted into local variable  
						
						 
						
						... 
						
						
						
						Co-authored-by: delvh <dev.lh@web.de > 
						
						
					 
					
						2020-07-08 13:55:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								DieGurke 
							
						 
					 
					
						
						
							
						
						0bbb4c9f29 
					 
					
						
						
							
							Adjusted Query and implemented pending groupMessageStatusChange proc*ing  
						
						 
						
						
						
						
					 
					
						2020-07-08 13:53:10 +02:00