anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6e3549dbb7
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/patch-1.0.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java 
							
						 | 
						
							2020-10-27 13:41:18 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6c8aa7b12c
								
							
						 | 
						
							
							
								
								fixed client config export to configure a client with password
							
							
							
							
							
							
							
							added possibility to export client config on exam side with including
examId in the config 
							
						 | 
						
							2020-10-27 13:13:43 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								556ad80c8e
								
							
						 | 
						
							
							
								
								SEBSERV-136 prepare DB model and indicators for new features
							
							
							
							
							
						 | 
						
							2020-10-22 17:00:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								55cfc07a9d
								
							
						 | 
						
							
							
								
								fixed proctor room action update
							
							
							
							
							
						 | 
						
							2020-10-20 10:20:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b9b336886
								
							
						 | 
						
							
							
								
								fixed proctoring room issues
							
							
							
							
							
						 | 
						
							2020-10-19 13:42:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								daebd9b5f7
								
							
						 | 
						
							
							
								
								added more actions and connection list to proctor rooms
							
							
							
							
							
						 | 
						
							2020-10-15 16:24:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d7d15c02c
								
							
						 | 
						
							
							
								
								new remote proctoring implementation
							
							
							
							
							
						 | 
						
							2020-10-14 16:41:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4a0f30adf
								
							
						 | 
						
							
							
								
								finished first impl of new proctoring strategy (collecting rooms)
							
							
							
							
							
						 | 
						
							2020-10-08 14:48:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0351fe558
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/patch-1.0.2' into development
							
							
							
							
							
						 | 
						
							2020-10-07 15:17:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b77f95849
								
							
						 | 
						
							
							
								
								fixed connection table update on status filter change
							
							
							
							
							
						 | 
						
							2020-10-07 15:09:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								62f2437dad
								
							
						 | 
						
							
							
								
								proctoring collecting rooms first implementation
							
							
							
							
							
						 | 
						
							2020-10-07 15:07:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								f7643f94ea
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/patch-1.0.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/RAPConfiguration.java 
							
						 | 
						
							2020-10-06 11:52:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								606de67aa2
								
							
						 | 
						
							
							
								
								added static property support to GUI and fix setting gui endpoint
							
							
							
							
							
						 | 
						
							2020-10-06 11:50:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9393068df
								
							
						 | 
						
							
							
								
								remote proctoring
							
							
							
							
							
						 | 
						
							2020-10-06 11:30:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								99bc028208
								
							
						 | 
						
							
							
								
								try proctoring popup with RAP Browser tool and new RAPServlet mapping
							
							
							
							
							
						 | 
						
							2020-10-05 15:20:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								dfd4f67f0a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/patch-1.0.2' into development
							
							
							
							
							
						 | 
						
							2020-09-30 11:04:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								dfda89a45a
								
							
						 | 
						
							
							
								
								fixed form validation error and added new config attributes (migration)
							
							
							
							
							
						 | 
						
							2020-09-30 11:02:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1da749a473
								
							
						 | 
						
							
							
								
								fixed moodle and proctoring
							
							
							
							
							
						 | 
						
							2020-09-29 17:48:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								257b400e1a
								
							
						 | 
						
							
							
								
								fixed sebserver.gui.http.external.port
							
							
							
							
							
						 | 
						
							2020-09-19 09:54:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c0c8a4c41
								
							
						 | 
						
							
							
								
								SEBSERV-139 implementing join-in room in overall monitoring view
							
							
							
							
							
						 | 
						
							2020-08-27 10:37:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a91192ecbb
								
							
						 | 
						
							
							
								
								SEBSERV-139 fixed quiz import bug
							
							
							
							
							
						 | 
						
							2020-08-26 10:01:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ea936cf81
								
							
						 | 
						
							
							
								
								SEBSERV-139 Proctoring room join and leave API
							
							
							
							
							
						 | 
						
							2020-08-25 16:47:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9923e06029
								
							
						 | 
						
							
							
								
								SEBSERV-139 added GUI in Exam-Config
							
							
							
							
							
						 | 
						
							2020-08-24 12:52:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								2bea1f25c6
								
							
						 | 
						
							
							
								
								added GuiServiceInfo
							
							
							
							
							
						 | 
						
							2020-08-20 19:30:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								343643b331
								
							
						 | 
						
							
							
								
								added external server name for GUI component
							
							
							
							
							
						 | 
						
							2020-08-20 18:00:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								feb3836b12
								
							
						 | 
						
							
							
								
								add proctoring attributes
							
							
							
							
							
						 | 
						
							2020-08-20 16:44:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e293c7602
								
							
						 | 
						
							
							
								
								SEBSERV-139 Jitsi Javascript API integration
							
							
							
							
							
						 | 
						
							2020-08-20 08:28:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								59e3d29e3d
								
							
						 | 
						
							
							
								
								Merge branch 'patch-1.0.2' into development
							
							
							
							
							
						 | 
						
							2020-08-12 16:45:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								cdf3b6d452
								
							
						 | 
						
							
							
								
								fixed deletion of empty table rows on status change
							
							
							
							
							
						 | 
						
							2020-08-12 16:44:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								6980715e2f
								
							
						 | 
						
							
							
								
								SEBSERV-139 TestBot integration and testing and fixes
							
							
							
							
							
						 | 
						
							2020-08-11 16:01:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								65cdb1dc52
								
							
						 | 
						
							
							
								
								SEBSERV-139 SEB instruction for proctoring support
							
							
							
							
							
						 | 
						
							2020-08-11 14:23:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								7335547341
								
							
						 | 
						
							
							
								
								SEBSERV-139 integration of token generation
							
							
							
							
							
						 | 
						
							2020-08-10 11:42:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								548d4d132f
								
							
						 | 
						
							
							
								
								SEBSERV-139 implementing GUI
							
							
							
							
							
						 | 
						
							2020-08-06 17:01:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								6eedcbb4a0
								
							
						 | 
						
							
							
								
								Merge branch 'patch-1.0.2' into development
							
							
							
							
							
						 | 
						
							2020-08-05 16:59:12 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								f324424b3e
								
							
						 | 
						
							
							
								
								fixed some prefix for tooltip
							
							
							
							
							
						 | 
						
							2020-08-05 16:58:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec1630fa2f
								
							
						 | 
						
							
							
								
								SEBSERV-139 gui implementations
							
							
							
							
							
						 | 
						
							2020-08-05 16:55:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f9daddf53
								
							
						 | 
						
							
							
								
								SEBSERV-75 error handling for SEB Restriction
							
							
							
							
							
						 | 
						
							2020-08-05 11:14:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 |