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 
								
							 
						 
						
							
							
							
							
								
							
							
								a881de1c9b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2-ethz' into dev-1.2  
							
							
							
						 
						
							2021-11-10 10:22:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								49dfa9e3a0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2-ethz' into dev-1.2  
							
							
							
						 
						
							2021-11-10 10:14:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								52b96647c1 
								
							 
						 
						
							
							
								
								fine tune for distributed setup  
							
							
							
						 
						
							2021-11-10 10:00:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								70c4fe1571 
								
							 
						 
						
							
							
								
								added test id attributes  
							
							
							
						 
						
							2021-11-09 16:47:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								814fa84730 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2-ethz' into dev-1.2  
							
							... 
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/DistributedPingCache.java 
							
						 
						
							2021-11-09 09:47:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								780a17834c 
								
							 
						 
						
							
							
								
								more fixes to prevent DB deadlocks  
							
							
							
						 
						
							2021-11-09 09:39:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								2447009f99 
								
							 
						 
						
							
							
								
								fixed potential DB deadlock cause  
							
							
							
						 
						
							2021-11-09 09:02:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								4a3d5ed54d 
								
							 
						 
						
							
							
								
								fixed potential DB deadlock cause  
							
							
							
						 
						
							2021-11-09 08:53:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								f1dc16b5ef 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/SEBSERV-191' into dev-1.2  
							
							... 
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java 
							
						 
						
							2021-11-08 13:13:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								9ebd7827ac 
								
							 
						 
						
							
							
								
								SEBSERV-238 improved proctoring room assignments for connecting clients  
							
							... 
							
							
							
							(re)mark a client connection for update if the join instruction was not
be able to send to the SEB client. In this case this shall be tried
again until it works. 
							
						 
						
							2021-11-08 12:56:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								c89a609615 
								
							 
						 
						
							
							
								
								SEBSERV-238 use max exp time for Zoom SDK Token generation  
							
							... 
							
							
							
							(no exam end-time involvement to check if this was the error) 
							
						 
						
							2021-11-08 12:54:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								3aa46b3241 
								
							 
						 
						
							
							
								
								better logging for Zoom Proctoring  
							
							
							
						 
						
							2021-11-04 17:36:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								06ce72a76f 
								
							 
						 
						
							
							
								
								SEBSERV-191 gui implementation and download streaming  
							
							
							
						 
						
							2021-11-04 16:52:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								32d8c8a978 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into SEBSERV-191  
							
							
							
						 
						
							2021-11-03 13:22:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								c414586fec 
								
							 
						 
						
							
							
								
								SEBSERV-191 finished back-end implementation  
							
							
							
						 
						
							2021-11-03 13:18:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								40ab3861db 
								
							 
						 
						
							
							
								
								better logging  
							
							
							
						 
						
							2021-11-03 11:29:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								2f2a3670b7 
								
							 
						 
						
							
							
								
								SEBSERV-191 backend implementation  
							
							
							
						 
						
							2021-11-03 10:31:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								458cc9486e 
								
							 
						 
						
							
							
								
								SEBSERV-238  
							
							
							
						 
						
							2021-11-02 13:55:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								daeb118210 
								
							 
						 
						
							
							
								
								SEBSERV-239  
							
							
							
						 
						
							2021-11-02 10:04:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								81d871b521 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development  
							
							... 
							
							
							
							Conflicts:
	pom.xml
	src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java 
							
						 
						
							2021-11-01 09:49:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								7a05820274 
								
							 
						 
						
							
							
								
								SEBSERV-236 fixed  
							
							
							
						 
						
							2021-10-28 14:33:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								299769bcb6 
								
							 
						 
						
							
							
								
								Merge branch 'rel-1.2.2-exam-update-fix' into dev-1.2  
							
							
							
						 
						
							2021-10-28 13:48:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								9ce538484b 
								
							 
						 
						
							
							
								
								fixed single moodle course bug  
							
							
							
						 
						
							2021-10-28 13:45:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								d763da6a79 
								
							 
						 
						
							
							
								
								fixed exam update task for finished exams  
							
							... 
							
							
							
							finished exams where opened-up and immediately closed agian and again
on every task run. 
							
						 
						
							2021-10-27 12:45:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								ea65d1e81c 
								
							 
						 
						
							
							
								
								code analysis  
							
							
							
						 
						
							2021-10-27 09:11:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								b06e6d5424 
								
							 
						 
						
							
							
								
								Fixed Zoom SDK JWT-Token generation  
							
							
							
						 
						
							2021-10-25 13:31:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								5cf2547b86 
								
							 
						 
						
							
							
								
								Merge branch 'dev-lms-open-olat' into dev-1.2  
							
							
							
						 
						
							2021-10-25 10:43:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Carol Alexandru 
								
							 
						 
						
							
							
							
							
								
							
							
								1449de217c 
								
							 
						 
						
							
							
								
								don't construct json manually  
							
							
							
						 
						
							2021-10-13 12:01:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Carol Alexandru 
								
							 
						 
						
							
							
							
							
								
							
							
								519ad5a9f8 
								
							 
						 
						
							
							
								
								authenticate with OLAT using POST instead of GET  
							
							
							
						 
						
							2021-10-13 11:29:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								5b8d920a4f 
								
							 
						 
						
							
							
								
								SEBSERV-160 more back-end implementation  
							
							
							
						 
						
							2021-10-11 17:12:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								fa5aa6353c 
								
							 
						 
						
							
							
								
								SEBSERV-160 new db schema and back-end implementation  
							
							
							
						 
						
							2021-10-11 09:22:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								b1181bb97a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development  
							
							... 
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/ExamAdminService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamAdminServiceImpl.java 
							
						 
						
							2021-10-07 10:50:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								020a885c1b 
								
							 
						 
						
							
							
								
								fix: Zoom meetings created by ad-hoc users-accounts are now lizensed  
							
							... 
							
							
							
							fix: Cleanup zoom rooms, meetings and ad-hoc users-accounts on exam
deletion and prevent SQL foreign constraint error on deletion process
when there are still living Zoom rooms for the exam. 
							
						 
						
							2021-10-07 09:30:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								67bd9bf647 
								
							 
						 
						
							
							
								
								SEBSERV-160 new db schema  
							
							
							
						 
						
							2021-10-06 17:47:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								debc876da7 
								
							 
						 
						
							
							
								
								added batch_action table  
							
							
							
						 
						
							2021-10-05 14:54:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								1a592ac606 
								
							 
						 
						
							
							
								
								SEBSERV-201 finished up  
							
							
							
						 
						
							2021-09-30 15:45:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								f7a8fb4a33 
								
							 
						 
						
							
							
								
								SEBSERV-160  
							
							
							
						 
						
							2021-09-30 14:59:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								d0407645d8 
								
							 
						 
						
							
							
								
								SEBSERV-175 implemented  
							
							
							
						 
						
							2021-09-30 11:27:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								177d448e08 
								
							 
						 
						
							
							
								
								SEBSERV-160  
							
							
							
						 
						
							2021-09-30 11:00:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								69c9de6d64 
								
							 
						 
						
							
							
								
								SEBSERV-155 implementation  
							
							
							
						 
						
							2021-09-29 16:06:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								7817ed48c4 
								
							 
						 
						
							
							
								
								fixed migration  
							
							
							
						 
						
							2021-09-29 13:37:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								7d7f458d82 
								
							 
						 
						
							
							
								
								SEBSERV-201 added migrations  
							
							
							
						 
						
							2021-09-28 17:14:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								92207cf2c3 
								
							 
						 
						
							
							
								
								fixed tests  
							
							
							
						 
						
							2021-09-27 10:48:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								33c915bd92 
								
							 
						 
						
							
							
								
								SEBSERV-230 removed attributes from GUI  
							
							
							
						 
						
							2021-09-27 10:35:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								2fd3850186 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development  
							
							... 
							
							
							
							Conflicts:
	.github/workflows/buildReporting.yml
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java 
							
						 
						
							2021-09-23 11:05:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								42993e3c97 
								
							 
						 
						
							
							
								
								fixed SEB session integrity check (allow multiple establish requests  
							
							... 
							
							
							
							from same SEB client. This is usful when the SEB sends the userSessionId
multiple times) 
							
						 
						
							2021-09-23 09:30:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								6fc54e5310 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development  
							
							... 
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamDeletePopup.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/EntityController.java 
							
						 
						
							2021-09-22 17:07:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								70358d0128 
								
							 
						 
						
							
							
								
								fixed session id, exam delete, ane better logs  
							
							
							
						 
						
							2021-09-22 16:55:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								349303c168 
								
							 
						 
						
							
							
								
								fixed monitoring with no indicators  
							
							
							
						 
						
							2021-09-21 14:43:41 +02:00