| 
								
								
									 anhefti | 0bda2cb292 | Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientInstruction.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java | 2021-05-12 17:37:08 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | d7e52efac9 | added userid to pin for Jitsi broadcasting instruction | 2021-05-12 13:39:09 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | c9be24197d | SEBSERV-135 finished up decryption | 2021-05-12 11:15:24 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | a4cb075f42 | fix for java 8 | 2021-05-12 09:55:17 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | a853c02947 | SEBSERV-135 finished implementation | 2021-05-12 09:50:58 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | a46e2c0b27 | made CircuitBreaker thread safe | 2021-05-12 08:11:41 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 5e4404c1b5 | docu | 2021-05-11 22:44:44 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 636c51a6f3 | docu | 2021-05-11 21:58:42 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 100c5820a2 | code cleanup and docu | 2021-05-11 21:55:51 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 70fcbead41 | API documentation | 2021-05-11 21:07:57 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 10fd2f408d | added missing active columns | 2021-05-07 12:54:29 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 8be642c31c | SEBSERV-108 addes sort and default sort for all except lms lookup | 2021-05-07 12:13:13 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | c222f4216e | SEBSERV-135 try to encrypt config but still fails | 2021-05-06 17:10:42 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 6bf1551028 | certs impl | 2021-05-04 21:59:04 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 1a67ec773d | Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development | 2021-04-30 16:07:59 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | eaf555ae11 | fixed working with context path for webservice and guiservice | 2021-04-30 15:59:15 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 3872e0f725 | SEBSERV-135 gui | 2021-04-30 13:32:22 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 4750a96032 | fixed compile errors | 2021-04-28 17:27:09 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 6966c520c5 | fixes | 2021-04-28 17:22:14 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 0bd7383bd2 | Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development | 2021-04-28 17:20:12 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 8daeceeffa | added fav icon | 2021-04-28 17:18:30 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 89bb29ed4f | SEBSERV-135 gui implementation and fixes | 2021-04-28 17:12:17 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 8b025d17af | certificates | 2021-04-27 15:17:29 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | f15c851b77 | updated flyway | 2021-04-27 15:17:16 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | cd1b3274a7 | fixed converter | 2021-04-27 13:07:28 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 0e192bc76f | fix build for Java 8 | 2021-04-22 08:53:57 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 18dce53170 | SEBSERV-135 - gui implementation | 2021-04-22 08:49:52 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | ab8ac01e05 | SEBSERV-135 backend implementation | 2021-04-21 14:16:44 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 33e6fab629 | refactor create page form list (noSQL) | 2021-04-20 16:21:21 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 813b1c84ba | added check on creation | 2021-04-20 16:19:55 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 3e80bd0195 | refactor name check | 2021-04-20 16:19:05 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | ed8d98a40b | fixed privilege check on createNew | 2021-04-20 16:18:21 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | ec8f7c9258 | code cleanup | 2021-04-20 16:17:31 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 275d4cd7b4 | Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java | 2021-04-14 10:56:05 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 3381d69f8b | Improved Exam Config streaming on SEB Client connection handshake | 2021-04-14 09:15:21 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 3d5c05a125 | Merge remote-tracking branch 'origin/master' into dev-1.1-patch-1 | 2021-04-12 18:42:44 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 7836b180db | Merge remote-tracking branch 'origin/master' into development Conflicts:
	.github/workflows/buildReporting_Java11.yml | 2021-04-12 17:58:25 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 0603f0b2dd | fixed test for new CI | 2021-04-12 16:42:22 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 7d412c18cb | test git actions | 2021-04-12 15:26:34 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | a09d250963 | fixed build | 2021-04-12 14:47:51 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 3a4810e54f | fix stests | 2021-04-12 14:23:37 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 2f01f8c7da | Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development | 2021-04-12 14:17:00 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 078ab15a86 | Better error handling and logging | 2021-04-12 14:08:49 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 5bfc635785 | more tests | 2021-04-12 10:34:45 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 449f7d5824 | SEBSERV-148 test and fixes | 2021-04-08 15:44:05 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 7fae3f4baf | SEBSERV-148 testing fixing | 2021-04-08 10:36:32 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | d014dfe45a | SEBSERV-148 GUI implementation with expandable accordion | 2021-04-08 08:28:18 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 7cd2d3566d | Zoom gui | 2021-04-07 12:43:07 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | 357251d40b | Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development | 2021-04-06 19:30:15 +02:00 |  | 
				
					
						| 
								
								
									 anhefti | ff74c534dd | SEBSERV-183 fix | 2021-04-06 19:27:17 +02:00 |  |