b54e167ee7 
					 
					
						
						
							
							Merge pull request  #42  in ~VLE2FE/definma-ui from f/dashboard to master  
						
						 
						
						... 
						
						
						
						* commit 'bfe3788c377f25e239416b6f41057517c59cdf68':
  Apply sample page fix 
						
						
					 
					
						2020-12-10 13:17:56 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bfe3788c37 
					 
					
						
						
							
							Merge branch 'master' into f/dashboard  
						
						 
						
						
						
						
					 
					
						2020-12-10 11:58:14 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5232c4d4e4 
					 
					
						
						
							
							Apply sample page fix  
						
						 
						
						
						
						
					 
					
						2020-12-10 11:48:15 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						dabf9fcf22 
					 
					
						
						
							
							Merge pull request  #41  in ~VLE2FE/definma-ui from b/sample-page to master  
						
						 
						
						... 
						
						
						
						* commit '8912330d29f0aa1341acd3357dd899872b0f3335':
  Reset current page when applying filter.
  Samples get now loaded according to page. 
						
						
					 
					
						2020-12-07 08:01:36 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8912330d29 
					 
					
						
						
							
							Reset current page when applying filter.  
						
						 
						
						
						
						
					 
					
						2020-12-04 13:55:04 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						42b9eb979a 
					 
					
						
						
							
							Samples get now loaded according to page.  
						
						 
						
						
						
						
					 
					
						2020-12-04 11:37:25 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ad20fdb1bb 
					 
					
						
						
							
							Merge pull request  #40  in ~VLE2FE/definma-ui from f/edit-button-placement to master  
						
						 
						
						... 
						
						
						
						* commit '7e82b43e069085e5975dd618ec2ebd0e4e43eb82':
  Store current sample page
  Move Sample edit-button to the left hand side 
						
						
					 
					
						2020-12-03 14:44:49 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7e82b43e06 
					 
					
						
						
							
							Store current sample page  
						
						 
						
						
						
						
					 
					
						2020-12-03 14:39:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						94649011f3 
					 
					
						
						
							
							Merge pull request  #39  in ~VLE2FE/definma-ui from b/ui-fixes to master  
						
						 
						
						... 
						
						
						
						* commit 'ad52baf30af53c5a1ae7868bd47f5862774b1327':
  Display sample number in sample editor
  Remove non-existent image reference, fix HTML escapes 
						
						
					 
					
						2020-12-03 14:01:36 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ad52baf30a 
					 
					
						
						
							
							Display sample number in sample editor  
						
						 
						
						
						
						
					 
					
						2020-12-03 13:10:52 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hartenstein Ruben (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						3526dcb049 
					 
					
						
						
							
							Move Sample edit-button to the left hand side  
						
						 
						
						
						
						
					 
					
						2020-12-03 11:41:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Engelbart Kai Sven (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						526f9750ec 
					 
					
						
						
							
							Remove non-existent image reference, fix HTML escapes  
						
						 
						
						
						
						
					 
					
						2020-12-02 15:53:39 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lotter Elisabeth (CR/APS1) 
							
						 
					 
					
						
						
							
						
						ff9d56c005 
					 
					
						
						
							
							Changes: Colors for Prediction added  
						
						 
						
						
						
						
					 
					
						2020-10-02 10:11:16 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Veit Lukas (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						1bafb21f5c 
					 
					
						
						
							
							Merge pull request  #38  in ~VLE2FE/definma-ui from development to master  
						
						 
						
						... 
						
						
						
						* commit '3badd6173dd083d8df2a4aba3d0ecab8fc3d104f':
  updated README 
						
						
					 
					
						2020-09-07 10:17:04 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						3badd6173d 
					 
					
						
						
							
							updated README  
						
						 
						
						
						
						
					 
					
						2020-09-07 10:16:17 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						2bcd912e50 
					 
					
						
						
							
							v0.9.0  
						
						 
						
						
						
						
					 
					
						2020-09-03 15:53:32 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Veit Lukas (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						2fa3ee9d3e 
					 
					
						
						
							
							Merge pull request  #37  in ~VLE2FE/definma-ui from development to master  
						
						 
						
						... 
						
						
						
						* commit 'c38d0be4578be9e84d594614a6a94411715c051e':
  code improvements
  implemented editable help
  implemented editable help
  implemented no measurements or condition filter 
						
						
					 
					
						2020-09-03 15:52:21 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						c38d0be457 
					 
					
						
						
							
							code improvements  
						
						 
						
						
						
						
					 
					
						2020-09-03 15:51:53 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						1440e9a6fc 
					 
					
						
						
							
							implemented editable help  
						
						 
						
						
						
						
					 
					
						2020-09-03 10:54:20 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						2dc962c754 
					 
					
						
						
							
							implemented editable help  
						
						 
						
						
						
						
					 
					
						2020-09-03 10:53:41 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						bda6331c59 
					 
					
						
						
							
							implemented no measurements or condition filter  
						
						 
						
						
						
						
					 
					
						2020-09-02 16:31:59 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						23a50e26e9 
					 
					
						
						
							
							v0.8.2  
						
						 
						
						
						
						
					 
					
						2020-09-02 15:08:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Veit Lukas (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						92a5f483e2 
					 
					
						
						
							
							Merge pull request  #36  in ~VLE2FE/definma-ui from development to master  
						
						 
						
						... 
						
						
						
						* commit '1460b5c1e65dead975954ed0b384a395e8c3af45':
  string validation fix for true and false
  small fixes 
						
						
					 
					
						2020-09-02 15:07:33 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						1460b5c1e6 
					 
					
						
						
							
							string validation fix for true and false  
						
						 
						
						
						
						
					 
					
						2020-09-02 15:06:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						78093ce2ff 
					 
					
						
						
							
							small fixes  
						
						 
						
						
						
						
					 
					
						2020-09-02 14:11:00 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						9d9435b408 
					 
					
						
						
							
							v0.8.1  
						
						 
						
						
						
						
					 
					
						2020-09-01 15:16:40 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Veit Lukas (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						1f1ce7dd9c 
					 
					
						
						
							
							Merge pull request  #35  in ~VLE2FE/definma-ui from development to master  
						
						 
						
						... 
						
						
						
						* commit 'cd4e2aa77b5dd66d4898adf7494e47a0466a9595':
  added model documentation
  added material search
  fixed new user model input and renaming model group
  renamed material name to product name, removed headings 
						
						
					 
					
						2020-09-01 15:15:54 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						cd4e2aa77b 
					 
					
						
						
							
							added model documentation  
						
						 
						
						
						
						
					 
					
						2020-09-01 15:15:21 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						206169e135 
					 
					
						
						
							
							added material search  
						
						 
						
						
						
						
					 
					
						2020-09-01 14:41:15 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						ea02ba0f09 
					 
					
						
						
							
							fixed new user model input and renaming model group  
						
						 
						
						
						
						
					 
					
						2020-09-01 13:55:13 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						8fd993b362 
					 
					
						
						
							
							renamed material name to product name, removed headings  
						
						 
						
						
						
						
					 
					
						2020-08-31 17:10:44 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						c05bceb82c 
					 
					
						
						
							
							v0.8.0  
						
						 
						
						
						
						
					 
					
						2020-08-31 16:16:44 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Veit Lukas (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						b814335130 
					 
					
						
						
							
							Merge pull request  #33  in ~VLE2FE/definma-ui from development to master  
						
						 
						
						... 
						
						
						
						* commit '250b04e096b8a476af8608c571f43a2636897a6a':
  material and activeModelIndex fix 
						
						
					 
					
						2020-08-31 16:15:22 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						250b04e096 
					 
					
						
						
							
							material and activeModelIndex fix  
						
						 
						
						
						
						
					 
					
						2020-08-31 16:14:47 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						0f35616b0c 
					 
					
						
						
							
							v0.7.3  
						
						 
						
						
						
						
					 
					
						2020-08-28 16:59:51 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Veit Lukas (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						c3ab2810dc 
					 
					
						
						
							
							Merge pull request  #32  in ~VLE2FE/definma-ui from development to master  
						
						 
						
						... 
						
						
						
						* commit '08d5ac8366279aae4da809a545c4949b2d583c6e':
  fixed changelog paging 
						
						
					 
					
						2020-08-28 16:59:05 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						08d5ac8366 
					 
					
						
						
							
							fixed changelog paging  
						
						 
						
						
						
						
					 
					
						2020-08-28 16:58:35 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						dcdfd209f3 
					 
					
						
						
							
							v0.7.2  
						
						 
						
						
						
						
					 
					
						2020-08-28 09:37:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Veit Lukas (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						7187bba40b 
					 
					
						
						
							
							Merge pull request  #31  in ~VLE2FE/definma-ui from development to master  
						
						 
						
						... 
						
						
						
						* commit '52e0d94e6187d377afe336c5d2b80b82d9d110f1':
  implemented model list
  updated to new model format 
						
						
					 
					
						2020-08-28 09:36:49 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						52e0d94e61 
					 
					
						
						
							
							implemented model list  
						
						 
						
						
						
						
					 
					
						2020-08-28 09:22:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						f0aad664d0 
					 
					
						
						
							
							updated to new model format  
						
						 
						
						
						
						
					 
					
						2020-08-28 08:14:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						c632d82b6e 
					 
					
						
						
							
							v0.7.1  
						
						 
						
						
						
						
					 
					
						2020-08-27 15:47:46 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Veit Lukas (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						2d1b1a83aa 
					 
					
						
						
							
							Merge pull request  #30  in ~VLE2FE/definma-ui from development to master  
						
						 
						
						... 
						
						
						
						* commit '819666c3444181dbe6e08ab155b4b027149217e2':
  condition fix
  template fixes 
						
						
					 
					
						2020-08-27 15:47:00 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						819666c344 
					 
					
						
						
							
							condition fix  
						
						 
						
						
						
						
					 
					
						2020-08-27 15:45:52 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						04c2ff2678 
					 
					
						
						
							
							template fixes  
						
						 
						
						
						
						
					 
					
						2020-08-27 13:56:55 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						85d413d26a 
					 
					
						
						
							
							v0.7.0  
						
						 
						
						
						
						
					 
					
						2020-08-26 19:26:56 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Veit Lukas (PEA4-Fe) 
							
						 
					 
					
						
						
							
						
						bc6b7283c9 
					 
					
						
						
							
							Merge pull request  #29  in ~VLE2FE/definma-ui from development to master  
						
						 
						
						... 
						
						
						
						* commit '6f95ff41489216acdb6368ad098f16684d9d8310':
  added user status and prediction user
  fixed to the top button 
						
						
					 
					
						2020-08-26 19:26:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						6f95ff4148 
					 
					
						
						
							
							added user status and prediction user  
						
						 
						
						
						
						
					 
					
						2020-08-26 19:25:31 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						3e53ef874c 
					 
					
						
						
							
							fixed to the top button  
						
						 
						
						
						
						
					 
					
						2020-08-25 09:01:45 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								VLE2FE 
							
						 
					 
					
						
						
							
						
						90f92c2c33 
					 
					
						
						
							
							v0.6.7  
						
						 
						
						
						
						
					 
					
						2020-08-25 08:18:33 +02:00