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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								d897b91be9
								
							
						 | 
						
							
							
								
								integration tests for instruction service
							
							
							
							
							
						 | 
						
							2021-09-16 15:27:13 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7973d56ce
								
							
						 | 
						
							
							
								
								SEBSERV-162, SEBSERV-153 extend db-model for features
							
							
							
							
							
						 | 
						
							2021-08-30 16:24:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								03300923c0
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.2' into development
							
							
							
							
							
						 | 
						
							2021-08-30 13:14:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea9de0e60d
								
							
						 | 
						
							
							
								
								set default LMSSetup type to "Testing"
							
							
							
							
							
						 | 
						
							2021-08-30 11:25:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac214401e1
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-lms-ans' into dev-1.2
							
							
							
							
							
						 | 
						
							2021-08-30 11:12:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								6122331d6d
								
							
						 | 
						
							
							
								
								fixed for Java 8 (replaced Map.of --> new HashMap<>())
							
							
							
							
							
						 | 
						
							2021-08-30 11:03:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a72cf1fcd
								
							
						 | 
						
							
							
								
								code review and cleanup (eclipse code formatting)
							
							
							
							
							
						 | 
						
							2021-08-30 10:55:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Carol Alexandru
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e31ad5e0e
								
							
						 | 
						
							
							
								
								Retrieve start_url from Ans Assignment
							
							
							
							
							
						 | 
						
							2021-08-30 03:54:31 +02:00 | 
						
						
							
							
							
								
							
							
						 |