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 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								fa0715b673 
								
							 
						 
						
							
							
								
								SEBSERV-162 fixes and better error handling  
							
							
							
						 
						
							2021-09-21 14:38:45 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								e3ac612fb3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development  
							
							
							
						 
						
							2021-09-16 12:58:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								dffb0e61f8 
								
							 
						 
						
							
							
								
								fixed notification confirm for SEB also for delete  
							
							
							
						 
						
							2021-09-16 11:55:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								0546b97b0a 
								
							 
						 
						
							
							
								
								fixed notification confirm from SEB client  
							
							
							
						 
						
							2021-09-16 11:33:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								c126056959 
								
							 
						 
						
							
							
								
								fixed notification confirmation form SEB side  
							
							
							
						 
						
							2021-09-16 10:57:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								b0ad786c45 
								
							 
						 
						
							
							
								
								tests for instructions  
							
							
							
						 
						
							2021-09-16 09:50:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								fe7f2bbaba 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development  
							
							... 
							
							
							
							Conflicts:
	src/main/resources/messages.properties 
							
						 
						
							2021-09-16 08:44:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								c9ce66d89c 
								
							 
						 
						
							
							
								
								code cleanup  
							
							
							
						 
						
							2021-09-16 08:38:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								54a0f05a39 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development  
							
							... 
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java 
							
						 
						
							2021-09-16 08:37:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								cea62d5fa4 
								
							 
						 
						
							
							
								
								fixed instructions creation with attributes  
							
							
							
						 
						
							2021-09-15 16:53:42 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								f54b769388 
								
							 
						 
						
							
							
								
								better logging  
							
							
							
						 
						
							2021-09-09 11:34:59 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								c3eda2b81d 
								
							 
						 
						
							
							
								
								Fixed Exam update task to not brake on single exam update error  
							
							
							
						 
						
							2021-09-08 16:02:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								291a0e3532 
								
							 
						 
						
							
							
								
								code cleanup  
							
							
							
						 
						
							2021-09-07 15:38:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								87e12a998e 
								
							 
						 
						
							
							
								
								Correct some minor exam supporter rights  
							
							
							
						 
						
							2021-09-07 13:27:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								0f7ef455e8 
								
							 
						 
						
							
							
								
								Added Zoom Client App integration for collecting rooms  
							
							
							
						 
						
							2021-09-07 11:35:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								152955f712 
								
							 
						 
						
							
							
								
								SEBSERV-153 IndicatorTemplate implementation  
							
							
							
						 
						
							2021-09-06 15:58:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								446bb15a9c 
								
							 
						 
						
							
							
								
								added join URL for Zoom collecting rooms  
							
							
							
						 
						
							2021-09-06 11:21:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								a081a38f84 
								
							 
						 
						
							
							
								
								SEBSERV-162 fixed db schema  
							
							
							
						 
						
							2021-09-06 09:17:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								d469b30951 
								
							 
						 
						
							
							
								
								SEBSERV-162, SEBSERV-153 implementation  
							
							
							
						 
						
							2021-09-02 17:12:19 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								3143d9ed16 
								
							 
						 
						
							
							
								
								SEBSERV-162, SEBSERV-153 implementation break again...  
							
							
							
						 
						
							2021-08-31 15:38:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								e49a713f72 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development  
							
							
							
						 
						
							2021-08-31 11:17:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								5c12b86b55 
								
							 
						 
						
							
							
								
								fixed unique name message  
							
							
							
						 
						
							2021-08-31 11:16:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anhefti 
								
							 
						 
						
							
							
							
							
								
							
							
								6fdd4b11fe 
								
							 
						 
						
							
							
								
								SEBSERV-162 implementation  
							
							
							
						 
						
							2021-08-31 11:02:19 +02:00