anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d94637300
								
							
						 | 
						
							
							
								
								Merge branch 'dev-1.3' into development
							
							
							
							
							
							
							
							Conflicts:
	src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java 
							
						 | 
						
							2022-04-13 11:05:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ed1d96183
								
							
						 | 
						
							
							
								
								SEBSERV-292 fixed and also added unique name check for indicators
							
							
							
							
							
						 | 
						
							2022-04-13 10:53:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9956f1a122
								
							
						 | 
						
							
							
								
								SEBSERV-296 fixed
							
							
							
							
							
						 | 
						
							2022-04-12 17:01:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								93db8a4d9d
								
							
						 | 
						
							
							
								
								SEBSERV-160 added template column
							
							
							
							
							
						 | 
						
							2022-04-12 16:07:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								55baa2d518
								
							
						 | 
						
							
							
								
								SEBSERV-160 implemented reset from template
							
							
							
							
							
						 | 
						
							2022-04-12 15:05:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0921b713f5
								
							
						 | 
						
							
							
								
								Merge branch 'dev-1.3' into development
							
							
							
							
							
							
							
							Conflicts:
	pom.xml 
							
						 | 
						
							2022-04-12 08:22:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								554be43828
								
							
						 | 
						
							
							
								
								SEBSERV-291 fixed
							
							
							
							
							
						 | 
						
							2022-04-11 17:15:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa2bca9724
								
							
						 | 
						
							
							
								
								SEBSERV-160 added single action to reset to template settings
							
							
							
							
							
						 | 
						
							2022-04-11 17:09:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								8b856edb70
								
							
						 | 
						
							
							
								
								SEBSERV-160 adapt activation actions
							
							
							
							
							
						 | 
						
							2022-04-11 14:33:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d29a48151
								
							
						 | 
						
							
							
								
								SEBSERV-160 implemented state change batch action
							
							
							
							
							
						 | 
						
							2022-04-07 16:52:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								b323ddef83
								
							
						 | 
						
							
							
								
								SEBSERV-160 back-end implementation
							
							
							
							
							
						 | 
						
							2022-04-04 13:39:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Andreas Hefti
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cbe80c6748
								
							
						 | 
						
							
							
								
								Merge pull request #52 from lucaboesch/docutypo
							
							
							
							
							
							
							
							Some minor typos in docs and user dialogs. 
							
						 | 
						
							2022-04-04 08:58:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luca Bösch
								
							 
						 | 
						
							
							
							
							
								
							
							
								836322eb0c
								
							
						 | 
						
							
							
								
								Some minor typos in docs and user dialogs.
							
							
							
							
							
						 | 
						
							2022-04-01 15:37:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								23c63783d7
								
							
						 | 
						
							
							
								
								log an ping notification improvements
							
							
							
							
							
						 | 
						
							2022-03-31 08:11:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1aab22d267
								
							
						 | 
						
							
							
								
								Merge branch 'rel-1.3.2'
							
							
							
							
							
							
							
							Conflicts:
	pom.xml 
							
						 | 
						
							2022-03-30 15:25:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								16582d0ce8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.3' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/InternalClientConnectionDataFactory.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/AbstractClientIndicator.java 
							
						 | 
						
							2022-03-30 15:20:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6b92a767d
								
							
						 | 
						
							
							
								
								prepare for patch release 1.3.2
							
							
							
							
							
						 | 
						
							2022-03-30 14:20:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								6fe11287f4
								
							
						 | 
						
							
							
								
								better zoom proctoring error handling
							
							
							
							
							
						 | 
						
							2022-03-30 12:55:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc330c0eed
								
							
						 | 
						
							
							
								
								fixed distributed indicator value cache handling (patch-fix 1.3.2)
							
							
							
							
							
						 | 
						
							2022-03-30 10:10:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d86b8a186b
								
							
						 | 
						
							
							
								
								Finished exam test
							
							
							
							
							
						 | 
						
							2022-03-29 15:26:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c48526fce
								
							
						 | 
						
							
							
								
								SEBSERV-240 finished
							
							
							
							
							
						 | 
						
							2022-03-29 11:32:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								534b3e7ce1
								
							
						 | 
						
							
							
								
								added SEB compatibility and optional live proctoring statements
							
							
							
							
							
						 | 
						
							2022-03-29 09:06:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								085ec45fb1
								
							
						 | 
						
							
							
								
								separated clientConnection and clientConnectionData page filter and sort
							
							
							
							
							
						 | 
						
							2022-03-28 17:29:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3744e10406
								
							
						 | 
						
							
							
								
								fixed filter
							
							
							
							
							
						 | 
						
							2022-03-28 16:37:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf8b30e061
								
							
						 | 
						
							
							
								
								jenkins
							
							
							
							
							
						 | 
						
							2022-03-28 13:56:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								09b238d9c3
								
							
						 | 
						
							
							
								
								jenkins fix
							
							
							
							
							
						 | 
						
							2022-03-28 13:36:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee4e78a53a
								
							
						 | 
						
							
							
								
								fix jenkins
							
							
							
							
							
						 | 
						
							2022-03-28 11:48:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								29e724b45c
								
							
						 | 
						
							
							
								
								update jenkins pipline
							
							
							
							
							
						 | 
						
							2022-03-28 11:43:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9427d9af25
								
							
						 | 
						
							
							
								
								update jenkins
							
							
							
							
							
						 | 
						
							2022-03-28 11:27:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								feca1ad51c
								
							
						 | 
						
							
							
								
								Merge branch 'dev-1.3' into development
							
							
							
							
							
						 | 
						
							2022-03-28 11:12:52 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7b587a8f2
								
							
						 | 
						
							
							
								
								Merge branch 'dev-lms-ans' into dev-1.3
							
							
							
							
							
						 | 
						
							2022-03-28 09:11:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2269c0a7e
								
							
						 | 
						
							
							
								
								fix jenkins build
							
							
							
							
							
						 | 
						
							2022-03-24 19:58:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a196e74f61
								
							
						 | 
						
							
							
								
								fixing jenkins tests
							
							
							
							
							
						 | 
						
							2022-03-24 19:04:44 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a378941458
								
							
						 | 
						
							
							
								
								jenkins?
							
							
							
							
							
						 | 
						
							2022-03-24 18:09:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee93014478
								
							
						 | 
						
							
							
								
								fix push
							
							
							
							
							
						 | 
						
							2022-03-24 17:35:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								50f94e8581
								
							
						 | 
						
							
							
								
								fix use-case tests
							
							
							
							
							
						 | 
						
							2022-03-24 17:28:19 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ddf3005729
								
							
						 | 
						
							
							
								
								test github actions
							
							
							
							
							
						 | 
						
							2022-03-24 16:55:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6321730b5
								
							
						 | 
						
							
							
								
								Merge branch 'dev-1.3' into development
							
							
							
							
							
						 | 
						
							2022-03-24 16:50:04 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								fec8c4868a
								
							
						 | 
						
							
							
								
								Merge branch 'dev-1.3' into development
							
							
							
							
							
						 | 
						
							2022-03-24 16:47:19 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								75eb9d9c04
								
							
						 | 
						
							
							
								
								fixed distributed cache for finished exams
							
							
							
							
							
						 | 
						
							2022-03-24 16:46:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1cd6fb1888
								
							
						 | 
						
							
							
								
								SEBSERV-240 implementation and fixes
							
							
							
							
							
						 | 
						
							2022-03-24 15:33:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b3648bcee
								
							
						 | 
						
							
							
								
								SEBSERV-240 implementation
							
							
							
							
							
						 | 
						
							2022-03-24 08:24:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebbbf56314
								
							
						 | 
						
							
							
								
								implemented event handling for start and finish exams
							
							
							
							
							
						 | 
						
							2022-03-23 13:42:18 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6433c7c99
								
							
						 | 
						
							
							
								
								Merge branch 'dev-1.3' into development
							
							
							
							
							
							
							
							Conflicts:
	pom.xml 
							
						 | 
						
							2022-03-23 12:34:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9cc020712a
								
							
						 | 
						
							
							
								
								added some cleanup after exam finished
							
							
							
							
							
						 | 
						
							2022-03-23 12:31:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a35ba48844
								
							
						 | 
						
							
							
								
								SEBSERV-240 implementation
							
							
							
							
							
						 | 
						
							2022-03-23 11:34:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								41f0fe0f2b
								
							
						 | 
						
							
							
								
								apply patch (from Carol Alexandru <alexandru@ifi.uzh.ch>)
							
							
							
							
							
						 | 
						
							2022-03-23 08:31:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d56e71dbe
								
							
						 | 
						
							
							
								
								SEBSERV-240 implementation
							
							
							
							
							
						 | 
						
							2022-03-23 08:06:25 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								51e27ff4e5
								
							
						 | 
						
							
							
								
								fix docker build
							
							
							
							
							
						 | 
						
							2022-03-22 09:35:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								b960b19056
								
							
						 | 
						
							
							
								
								fix docker build
							
							
							
							
							
						 | 
						
							2022-03-22 08:56:36 +01:00 | 
						
						
							
							
							
								
							
							
						 |