anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7728d2fb3
								
							
						 | 
						
							
							
								
								SEBSERV-139 proctoring back-end implementation
							
							
							
							
							
						 | 
						
							2020-07-30 16:53:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								04e9b06e27
								
							
						 | 
						
							
							
								
								fixed deletion action activation
							
							
							
							
							
						 | 
						
							2020-07-29 14:42:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								376c3dd8c8
								
							
						 | 
						
							
							
								
								Merge branch 'patch-1.0.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientLogs.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java 
							
						 | 
						
							2020-07-29 12:10:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								63949a9416
								
							
						 | 
						
							
							
								
								fixed action disappearing on empty list
							
							
							
							
							
						 | 
						
							2020-07-29 12:07:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2d2ca6751
								
							
						 | 
						
							
							
								
								SEBSERV-133 added deletion for user activity logs for SEB server admins
							
							
							
							
							
						 | 
						
							2020-07-29 11:40:12 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9438206c9d
								
							
						 | 
						
							
							
								
								SEBSERV-133 added deletion to SEB client events
							
							
							
							
							
						 | 
						
							2020-07-28 15:34:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d85fd1b1d7
								
							
						 | 
						
							
							
								
								SEBSERV-133 simplify exam delete
							
							
							
							
							
						 | 
						
							2020-07-22 16:12:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								6255a6bf38
								
							
						 | 
						
							
							
								
								SEBSERV-133 deletion of exams
							
							
							
							
							
						 | 
						
							2020-07-22 16:04:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc0f15ab62
								
							
						 | 
						
							
							
								
								SEBSERV-10 GUI implementation
							
							
							
							
							
						 | 
						
							2020-07-21 16:27:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								265624ec4c
								
							
						 | 
						
							
							
								
								Merge branch 'patch-1.0.2' into development
							
							
							
							
							
						 | 
						
							2020-07-16 16:17:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								066df95d0c
								
							
						 | 
						
							
							
								
								fixed testing on LMS Setup and display messages HTML formatting
							
							
							
							
							
						 | 
						
							2020-07-16 16:16:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								66699d92d9
								
							
						 | 
						
							
							
								
								add comment for Java 8 fix
							
							
							
							
							
						 | 
						
							2020-07-14 17:06:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								abbf2093e5
								
							
						 | 
						
							
							
								
								fix for Java 8
							
							
							
							
							
						 | 
						
							2020-07-14 16:58:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e1e979855
								
							
						 | 
						
							
							
								
								fix Java 8 compilation!!!
							
							
							
							
							
						 | 
						
							2020-07-14 16:41:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								33952a1795
								
							
						 | 
						
							
							
								
								fix compile Java 8
							
							
							
							
							
						 | 
						
							2020-07-14 16:34:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								f61b142cc7
								
							
						 | 
						
							
							
								
								SEBSERV-10 GUI implementation
							
							
							
							
							
						 | 
						
							2020-07-14 15:25:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								896db25eca
								
							
						 | 
						
							
							
								
								SEBSERV-10 more integration tests and fixes
							
							
							
							
							
						 | 
						
							2020-07-09 15:32:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								36364ed607
								
							
						 | 
						
							
							
								
								added login and logout activity logs
							
							
							
							
							
						 | 
						
							2020-07-06 16:29:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc543f79da
								
							
						 | 
						
							
							
								
								Streamlined use of org.apache.commons.io.IOUtils
							
							
							
							
							
						 | 
						
							2020-07-01 14:07:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e73f08bea
								
							
						 | 
						
							
							
								
								API documentation
							
							
							
							
							
						 | 
						
							2020-06-18 08:42:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								e394cb5863
								
							
						 | 
						
							
							
								
								more integration tests
							
							
							
							
							
						 | 
						
							2020-06-16 14:14:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc22c94793
								
							
						 | 
						
							
							
								
								improved GUI startup info
							
							
							
							
							
						 | 
						
							2020-06-10 10:13:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								20c08e5db4
								
							
						 | 
						
							
							
								
								code cleanup Seb -> SEB
							
							
							
							
							
						 | 
						
							2020-06-04 08:52:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b6660eea9
								
							
						 | 
						
							
							
								
								SEBSERV-129 fixed unique name check error
							
							
							
							
							
						 | 
						
							2020-06-03 14:02:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a65c4356b8
								
							
						 | 
						
							
							
								
								SEBSERV-126 fix
							
							
							
							
							
						 | 
						
							2020-05-06 12:08:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								29c09adff9
								
							
						 | 
						
							
							
								
								Fixed monitoring update bug
							
							
							
							
							
						 | 
						
							2020-05-05 16:26:07 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								7fe3e5f6db
								
							
						 | 
						
							
							
								
								SEBSERV-127 fix
							
							
							
							
							
						 | 
						
							2020-05-05 15:40:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc490612cf
								
							
						 | 
						
							
							
								
								fixed equals
							
							
							
							
							
						 | 
						
							2020-05-05 13:33:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d1830f74b0
								
							
						 | 
						
							
							
								
								fixed minor bugs, sorting chapters and docu
							
							
							
							
							
						 | 
						
							2020-04-29 11:02:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c56d3a1bd7
								
							
						 | 
						
							
							
								
								SEBSERV-122 fixed
							
							
							
							
							
						 | 
						
							2020-04-22 16:43:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								f442b9885f
								
							
						 | 
						
							
							
								
								SEBSERV-91 implementation
							
							
							
							
							
						 | 
						
							2020-04-21 16:26:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d614fdf6e
								
							
						 | 
						
							
							
								
								SEBSERV-119 fix
							
							
							
							
							
						 | 
						
							2020-04-16 12:55:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab50fc774b
								
							
						 | 
						
							
							
								
								SEBSERV-110 fix
							
							
							
							
							
						 | 
						
							2020-04-15 09:26:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								200c21165f
								
							
						 | 
						
							
							
								
								SEBSERV-113
							
							
							
							
							
						 | 
						
							2020-04-09 14:31:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8082471bc
								
							
						 | 
						
							
							
								
								merge config keys with attached config history, minor GUI bug
							
							
							
							
							
						 | 
						
							2020-04-07 13:47:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f57d63fba
								
							
						 | 
						
							
							
								
								access fixed within template
							
							
							
							
							
						 | 
						
							2020-03-31 14:41:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								de8db15928
								
							
						 | 
						
							
							
								
								minor fix
							
							
							
							
							
						 | 
						
							2020-03-31 14:26:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								b5dfa097a4
								
							
						 | 
						
							
							
								
								minor access right fixes
							
							
							
							
							
						 | 
						
							2020-03-31 13:40:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d4a0fe1b8
								
							
						 | 
						
							
							
								
								dev fixed with none edit right on different institution
							
							
							
							
							
						 | 
						
							2020-03-31 13:23:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								be7a7cef77
								
							
						 | 
						
							
							
								
								add warning if course imported twice and seb restriction readonly view
							
							
							
							
							
						 | 
						
							2020-03-30 13:41:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6466d8f1d
								
							
						 | 
						
							
							
								
								new seb restrcition strategy and minor fixes
							
							
							
							
							
						 | 
						
							2020-03-30 11:03:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								02e3a104bf
								
							
						 | 
						
							
							
								
								SEBSERV-109 added surname column and fixed some sort issues
							
							
							
							
							
						 | 
						
							2020-03-25 19:00:09 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d20038a1e
								
							
						 | 
						
							
							
								
								SEBSERV-107 fixes
							
							
							
							
							
						 | 
						
							2020-03-25 16:09:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae26c1134f
								
							
						 | 
						
							
							
								
								code cleanup
							
							
							
							
							
						 | 
						
							2020-03-11 14:23:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d100679771
								
							
						 | 
						
							
							
								
								GUI improvements 2 and wording finish and versioning
							
							
							
							
							
						 | 
						
							2020-03-11 13:08:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								59030d4bbd
								
							
						 | 
						
							
							
								
								GUI improvements 2 and wording first part
							
							
							
							
							
						 | 
						
							2020-03-10 16:50:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d93ae0b5ed
								
							
						 | 
						
							
							
								
								code cleanup and docu
							
							
							
							
							
						 | 
						
							2020-03-09 14:01:49 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3b1ead068
								
							
						 | 
						
							
							
								
								fixed bug with duplication mark on monitoring table
							
							
							
							
							
						 | 
						
							2020-03-09 09:24:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								884f9c78e0
								
							
						 | 
						
							
							
								
								code cleanup
							
							
							
							
							
						 | 
						
							2020-03-05 16:05:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								df884bd8d2
								
							
						 | 
						
							
							
								
								fix docu and code cleanup
							
							
							
							
							
						 | 
						
							2020-03-05 15:25:05 +01:00 | 
						
						
							
							
							
								
							
							
						 |