anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c21f0ef463
								
							
						 | 
						
							
							
								
								# WARNING: head commit changed in the meantime
							
							
							
							
							
							
							
							Merge remote-tracking branch 'origin/master' into dev-1.3
plus more unit tests
plus CircuitBreaker fix 
							
						 | 
						
							2022-03-02 17:09:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9acb1b915
								
							
						 | 
						
							
							
								
								More Unit Tests and better logging
							
							
							
							
							
						 | 
						
							2022-02-21 13:50:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								11f879ba2c
								
							
						 | 
						
							
							
								
								Unit Tests, automated test keys...
							
							
							
							
							
						 | 
						
							2022-02-03 15:27:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								45322deea0
								
							
						 | 
						
							
							
								
								Merge branch 'SEBSERV-262' into development
							
							
							
							
							
						 | 
						
							2022-01-27 11:42:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0ab61c876d
								
							
						 | 
						
							
							
								
								SEBSERV-262
							
							
							
							
							
						 | 
						
							2022-01-27 11:39:57 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f8f8296d7
								
							
						 | 
						
							
							
								
								refactored downloads
							
							
							
							
							
						 | 
						
							2022-01-20 14:41:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								95c3f31cb9
								
							
						 | 
						
							
							
								
								- SEBSERV-250 fixed exam and access token cache
							
							
							
							
							
							
							
							- SEBSERV-188 implemented
- SEBSERV-165 code cleanup un monitoring 
							
						 | 
						
							2022-01-19 09:46:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								b1b582028f
								
							
						 | 
						
							
							
								
								SEBSERV-188 implementation
							
							
							
							
							
						 | 
						
							2022-01-18 13:33:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								50aef06db0
								
							
						 | 
						
							
							
								
								SEBSERV-250,SEBSERV-188
							
							
							
							
							
							
							
							- implemented overall generic incident marker for client connection
handler and removed specific missingPing incident.
- adapted missing ping handling to new overall generic incident marker 
							
						 | 
						
							2022-01-13 13:07:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								bad7510a63
								
							
						 | 
						
							
							
								
								SEBSERV-232 db extension and implementation
							
							
							
							
							
						 | 
						
							2022-01-12 16:35:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								48f23ea7e4
								
							
						 | 
						
							
							
								
								SEBSERV-200 fixed wrong JWT token generation with moderator flag
							
							
							
							
							
						 | 
						
							2022-01-11 16:37:04 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								863511dbc7
								
							
						 | 
						
							
							
								
								fixed time zone for CSV Export
							
							
							
							
							
						 | 
						
							2022-01-06 16:23:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0afa473fd
								
							
						 | 
						
							
							
								
								fixed date formatting with CSV Export
							
							
							
							
							
						 | 
						
							2022-01-06 16:11:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Damian Büchel
								
							 
						 | 
						
							
							
							
							
								
							
							
								40ac8780f3
								
							
						 | 
						
							
							
								
								SEBSERV-165: Implemented unit tests for client event CSV exporter and changed implementation to use separator constant.
							
							
							
							
							
						 | 
						
							2022-01-06 09:29:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d422d2091e
								
							
						 | 
						
							
							
								
								fixed test for jenkins
							
							
							
							
							
						 | 
						
							2022-01-05 10:44:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1692a54588
								
							
						 | 
						
							
							
								
								try fix integration test for Java 8
							
							
							
							
							
						 | 
						
							2022-01-05 10:02:10 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9fbc5bdbc1
								
							
						 | 
						
							
							
								
								SEBSERV-250 service for all indicators with separated table and update
							
							
							
							
							
						 | 
						
							2021-12-15 16:16:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								b99502dd41
								
							
						 | 
						
							
							
								
								SEBSERV-250 detach client event post processing (update and
							
							
							
							
							
							
							
							notifications) 
							
						 | 
						
							2021-12-08 10:33:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								dfb8afb740
								
							
						 | 
						
							
							
								
								SEBSERV-250 improved webservice init
							
							
							
							
							
						 | 
						
							2021-12-07 10:41:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								bab4b95609
								
							
						 | 
						
							
							
								
								SEBSERV-250 new table client_indicator for indicator values of running
							
							
							
							
							
							
							
							exams. 
							
						 | 
						
							2021-12-06 16:08:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9a1c3a019
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/test/resources/application-test.properties 
							
						 | 
						
							2021-11-24 13:34:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								46786af1d6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2-pingCache' into dev-1.2
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/DistributedPingCache.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java
	src/main/resources/config/application-dev-ws.properties 
							
						 | 
						
							2021-11-24 10:45:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a88e308ba9
								
							
						 | 
						
							
							
								
								SEBSERV-194 better distributed ping handling (dedicated ThreadPool)
							
							
							
							
							
						 | 
						
							2021-11-24 09:59:43 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e35a7745b
								
							
						 | 
						
							
							
								
								fixes and fine-tuning for distributed setup
							
							
							
							
							
						 | 
						
							2021-11-18 08:21:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9896258afc
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/ProctorRoomConnectionsPopup.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientEvents.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientEventController.java 
							
						 | 
						
							2021-11-10 13:25:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a747c48458
								
							
						 | 
						
							
							
								
								fixed tests
							
							
							
							
							
						 | 
						
							2021-11-09 09:07:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								10d16d8af8
								
							
						 | 
						
							
							
								
								fixed tests
							
							
							
							
							
						 | 
						
							2021-11-03 12:01:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b79662246
								
							
						 | 
						
							
							
								
								fixed integration tests
							
							
							
							
							
						 | 
						
							2021-09-21 16:19:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e3b397b28
								
							
						 | 
						
							
							
								
								fixed integration tests
							
							
							
							
							
						 | 
						
							2021-09-21 16:14:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0bd6664255
								
							
						 | 
						
							
							
								
								fix integration tests
							
							
							
							
							
						 | 
						
							2021-09-21 16:03:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebdd938123
								
							
						 | 
						
							
							
								
								more unit and integration tests
							
							
							
							
							
						 | 
						
							2021-09-21 15:57:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a00e9c1ab
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java 
							
						 | 
						
							2021-09-20 16:20:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								7d647cc9c2
								
							
						 | 
						
							
							
								
								fixed notification changes in GUI
							
							
							
							
							
						 | 
						
							2021-09-20 15:46:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d897b91be9
								
							
						 | 
						
							
							
								
								integration tests for instruction service
							
							
							
							
							
						 | 
						
							2021-09-16 15:27:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0ad786c45
								
							
						 | 
						
							
							
								
								tests for instructions
							
							
							
							
							
						 | 
						
							2021-09-16 09:50:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								25265fdb2b
								
							
						 | 
						
							
							
								
								SEBSERV-162 create exam from template and tests
							
							
							
							
							
						 | 
						
							2021-09-15 15:51:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a589fd8ad4
								
							
						 | 
						
							
							
								
								SEBSERV-162 audit logs and deletion
							
							
							
							
							
						 | 
						
							2021-09-14 11:52:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								f794ab5e7d
								
							
						 | 
						
							
							
								
								SEBSERV-162 implementations and test
							
							
							
							
							
						 | 
						
							2021-09-09 17:16:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef3a633ce1
								
							
						 | 
						
							
							
								
								SEBSERV-162 added institutional default flag
							
							
							
							
							
						 | 
						
							2021-09-09 10:21:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								36f546960b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamProctoringSettings.java 
							
						 | 
						
							2021-09-08 16:10:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f7ef455e8
								
							
						 | 
						
							
							
								
								Added Zoom Client App integration for collecting rooms
							
							
							
							
							
						 | 
						
							2021-09-07 11:35:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c412fc3d97
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development
							
							
							
							
							
						 | 
						
							2021-09-01 11:04:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0061b27e75
								
							
						 | 
						
							
							
								
								update zoom web SDK to version 1.9.8, make version configurable
							
							
							
							
							
							
							
							removed unused libs for zoom web SDK (jQuery) 
							
						 | 
						
							2021-08-31 17:02:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7973d56ce
								
							
						 | 
						
							
							
								
								SEBSERV-162, SEBSERV-153 extend db-model for features
							
							
							
							
							
						 | 
						
							2021-08-30 16:24:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d4272d2a0
								
							
						 | 
						
							
							
								
								changed Zoom API from 1.9.0 to 1.9.1
							
							
							
							
							
						 | 
						
							2021-08-26 20:30:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								81d6d132d6
								
							
						 | 
						
							
							
								
								remove Zoom join hook test
							
							
							
							
							
						 | 
						
							2021-08-26 16:27:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								aeb614082c
								
							
						 | 
						
							
							
								
								Merge branch 'proctoring_sdkkey' into dev-1.2
							
							
							
							
							
						 | 
						
							2021-08-12 13:34:52 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								52013752ea
								
							
						 | 
						
							
							
								
								fixed tests code cleanup
							
							
							
							
							
						 | 
						
							2021-08-10 09:50:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d27dbfbcf
								
							
						 | 
						
							
							
								
								Implement SDKToken for Zoom proctoring with SEB client for iOS and MacOS
							
							
							
							
							
						 | 
						
							2021-08-05 09:37:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								643c565b73
								
							
						 | 
						
							
							
								
								fixed time current millis
							
							
							
							
							
						 | 
						
							2021-08-03 18:26:19 +02:00 | 
						
						
							
							
							
								
							
							
						 |