anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0790b5827f
								
							
						 | 
						
							
							
								
								download name client config over exam
							
							
							
							
							
						 | 
						
							2020-12-14 17:20:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c002b4ac2
								
							
						 | 
						
							
							
								
								fixed various issues
							
							
							
							
							
						 | 
						
							2020-12-10 20:27:43 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a502699774
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into development
							
							
							
							
							
							
							
							Conflicts:
	pom.xml 
							
						 | 
						
							2020-12-07 16:35:57 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b8840c779
								
							
						 | 
						
							
							
								
								added LmsType enabling
							
							
							
							
							
						 | 
						
							2020-12-03 10:38:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								23be314a44
								
							
						 | 
						
							
							
								
								SEBSERV-136 fixed inverse scaled indicator
							
							
							
							
							
						 | 
						
							2020-12-02 17:00:25 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								12fcaa405c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/patch-1.0.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionDetails.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/AbstractClientIndicator.java 
							
						 | 
						
							2020-12-02 10:01:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f2cb493e0
								
							
						 | 
						
							
							
								
								added static column proportions for monitoring table
							
							
							
							
							
						 | 
						
							2020-12-02 09:49:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								5258f2384b
								
							
						 | 
						
							
							
								
								SEBSERV-136 fixed bug with two indicator of the same type.
							
							
							
							
							
							
							
							The indicator mapping on GUI side is now done within the id not the type 
							
						 | 
						
							2020-12-02 09:01:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3052ec1f59
								
							
						 | 
						
							
							
								
								SEBSERV-147 GUI implementation
							
							
							
							
							
						 | 
						
							2020-12-01 11:46:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7a4b60917
								
							
						 | 
						
							
							
								
								SEBSERV-147 GUI implementation
							
							
							
							
							
						 | 
						
							2020-11-30 13:01:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9267d34d3a
								
							
						 | 
						
							
							
								
								notification
							
							
							
							
							
						 | 
						
							2020-11-30 08:49:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3a372cfac
								
							
						 | 
						
							
							
								
								SEBSERV-136 SEBSERV-147 implementation and integration tests
							
							
							
							
							
						 | 
						
							2020-11-24 13:48:29 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								696a85a1fe
								
							
						 | 
						
							
							
								
								fixed some issues with proctoring rooms and error handling
							
							
							
							
							
						 | 
						
							2020-11-18 16:05:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b1641994a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/patch-1.0.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java 
							
						 | 
						
							2020-11-17 17:29:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								797ebdd200
								
							
						 | 
						
							
							
								
								changed internal method name
							
							
							
							
							
						 | 
						
							2020-11-17 17:05:25 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d7bd02382
								
							
						 | 
						
							
							
								
								fixed concurrent user login within ServerPushService
							
							
							
							
							
						 | 
						
							2020-11-17 17:04:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								61cd109ff2
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/patch-1.0.2' into development
							
							
							
							
							
						 | 
						
							2020-11-17 12:36:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b9b201da9
								
							
						 | 
						
							
							
								
								minor message fix
							
							
							
							
							
						 | 
						
							2020-11-17 12:29:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ff6e38d97f
								
							
						 | 
						
							
							
								
								SEBSERV-146 fixed
							
							
							
							
							
						 | 
						
							2020-11-17 12:28:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								222edfade4
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/patch-1.0.2' into development
							
							
							
							
							
						 | 
						
							2020-11-12 17:01:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e0ba0a9277
								
							
						 | 
						
							
							
								
								fix login error
							
							
							
							
							
						 | 
						
							2020-11-12 17:00:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								230b6edc9f
								
							
						 | 
						
							
							
								
								fixed logout error
							
							
							
							
							
						 | 
						
							2020-11-12 14:05:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bee3f7a059
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/patch-1.0.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java
	src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java 
							
						 | 
						
							2020-11-12 14:01:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								baee52a69a
								
							
						 | 
						
							
							
								
								fixed logout error bug
							
							
							
							
							
						 | 
						
							2020-11-12 13:52:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								53bb378d0b
								
							
						 | 
						
							
							
								
								SEBSERV-139 refactoring of townhall and instruction service
							
							
							
							
							
						 | 
						
							2020-11-12 13:28:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8e04e43bfa
								
							
						 | 
						
							
							
								
								SEBSERV-139 refactoring and implementation of town hall
							
							
							
							
							
						 | 
						
							2020-11-10 15:35:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								057275ba49
								
							
						 | 
						
							
							
								
								SEBSERV-139 added collecting all room feature
							
							
							
							
							
						 | 
						
							2020-10-28 15:20:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c0c8a4c41
								
							
						 | 
						
							
							
								
								SEBSERV-139 implementing join-in room in overall monitoring view
							
							
							
							
							
						 | 
						
							2020-08-27 10:37:56 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
								
							
							
						 |