anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a09d250963
								
							
						 | 
						
							
							
								
								fixed build
							
							
							
							
							
						 | 
						
							2021-04-12 14:47:51 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f01f8c7da
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development
							
							
							
							
							
						 | 
						
							2021-04-12 14:17:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								078ab15a86
								
							
						 | 
						
							
							
								
								Better error handling and logging
							
							
							
							
							
						 | 
						
							2021-04-12 14:08:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								7fae3f4baf
								
							
						 | 
						
							
							
								
								SEBSERV-148 testing fixing
							
							
							
							
							
						 | 
						
							2021-04-08 10:36:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d014dfe45a
								
							
						 | 
						
							
							
								
								SEBSERV-148 GUI implementation with expandable accordion
							
							
							
							
							
						 | 
						
							2021-04-08 08:28:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								7cd2d3566d
								
							
						 | 
						
							
							
								
								Zoom gui
							
							
							
							
							
						 | 
						
							2021-04-07 12:43:07 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								2bead4a52a
								
							
						 | 
						
							
							
								
								SEBSERV-148 GUI Exam Config impl
							
							
							
							
							
						 | 
						
							2021-04-06 18:44:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f2aff5084
								
							
						 | 
						
							
							
								
								SEBSERV-148 fixed JS API by switch to version 1.9.0
							
							
							
							
							
						 | 
						
							2021-04-01 15:13:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								29bda22a40
								
							
						 | 
						
							
							
								
								SEBSERV-148 implementation und fixes
							
							
							
							
							
						 | 
						
							2021-03-31 08:21:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ff8b703c9
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.1.0' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java
	src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/JitsiMeetProctoringView.java
	src/main/java/ch/ethz/seb/sebserver/gui/service/session/ProctoringGUIService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/RemoteProctoringRoomDAO.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/RemoteProctoringRoomDAOImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ExamProctoringRoomService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamProctoringRoomServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java 
							
						 | 
						
							2021-03-29 14:53:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								8470e3b160
								
							
						 | 
						
							
							
								
								SEBSERV-139 single used town-hall and code-cleanup
							
							
							
							
							
						 | 
						
							2021-03-29 13:50:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ffe4b6301a
								
							
						 | 
						
							
							
								
								SEBSERV-148 GUI impl
							
							
							
							
							
						 | 
						
							2021-03-25 16:56:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								70064206cf
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.1.0' into development
							
							
							
							
							
						 | 
						
							2021-03-23 16:38:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								e73dd5105a
								
							
						 | 
						
							
							
								
								Updated proctoring settings in Exam Config GUI
							
							
							
							
							
						 | 
						
							2021-03-23 16:29:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3350e4eece
								
							
						 | 
						
							
							
								
								SEBSERV-148 added HTML and script for zoom proctoring
							
							
							
							
							
						 | 
						
							2021-03-18 14:15:18 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad2f93e6cd
								
							
						 | 
						
							
							
								
								fixed for Java 8
							
							
							
							
							
						 | 
						
							2021-03-17 12:32:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c5373ebc4
								
							
						 | 
						
							
							
								
								Prepared for new LMS Setups
							
							
							
							
							
						 | 
						
							2021-03-17 11:42:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								bbcbc318a9
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.1.0' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/form/FormHandle.java 
							
						 | 
						
							2021-03-11 18:16:04 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0c5a4556b
								
							
						 | 
						
							
							
								
								SEBSERV-178 added request reate limits for user reg page
							
							
							
							
							
						 | 
						
							2021-03-11 17:24:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								53f3cc625e
								
							
						 | 
						
							
							
								
								SEBSERV-148 finished refactoring separate features and hook into
							
							
							
							
							
							
							
							underling proctoring service for room creation and closing 
							
						 | 
						
							2021-03-09 13:15:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								254255b3ac
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.1.0' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/api/APIMessage.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java 
							
						 | 
						
							2021-03-03 13:51:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa327e4e29
								
							
						 | 
						
							
							
								
								fixed view of foreign SEB Settings
							
							
							
							
							
						 | 
						
							2021-02-22 13:05:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f2a318f9d
								
							
						 | 
						
							
							
								
								proctoring refactoring and tests
							
							
							
							
							
						 | 
						
							2021-02-17 16:52:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad7f06e521
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.1.0' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java 
							
						 | 
						
							2021-02-16 12:55:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								89ebf4da4b
								
							
						 | 
						
							
							
								
								proctoring refactoring
							
							
							
							
							
						 | 
						
							2021-02-16 11:50:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6e9e55106
								
							
						 | 
						
							
							
								
								SEBWIN-464 added missing attributes and created migration task
							
							
							
							
							
						 | 
						
							2021-02-15 15:34:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c46251a9d
								
							
						 | 
						
							
							
								
								update Spring Boot version to 2.3.0.RELEASE
							
							
							
							
							
						 | 
						
							2021-02-02 17:58:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								18f3764422
								
							
						 | 
						
							
							
								
								Merge branch 'development' into development_VDI
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java
	src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java
	src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnection.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientConfigForm.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java 
							
						 | 
						
							2021-02-02 10:45:25 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								8bf00bf413
								
							
						 | 
						
							
							
								
								fixed some GUI issues
							
							
							
							
							
						 | 
						
							2021-01-27 17:24:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								199ba53688
								
							
						 | 
						
							
							
								
								SEBSERV-145 additional attributes in connection config
							
							
							
							
							
						 | 
						
							2021-01-27 16:57:10 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								4734b1a3b3
								
							
						 | 
						
							
							
								
								fixed GUI issues
							
							
							
							
							
						 | 
						
							2021-01-27 10:02:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff31692160
								
							
						 | 
						
							
							
								
								db schema update for distributed setup and a lot performance
							
							
							
							
							
							
							
							improvements done with caching as well as with the monitoring table
This should now also work for distributed setups but is not fully tested
yet 
							
						 | 
						
							2021-01-27 09:17:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c5008ad5c2
								
							
						 | 
						
							
							
								
								SEBSERV-97 implementation
							
							
							
							
							
						 | 
						
							2021-01-12 15:14:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								433aad87df
								
							
						 | 
						
							
							
								
								SEBSERV-147: finished todos
							
							
							
							
							
						 | 
						
							2021-01-06 15:55:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 |