anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9fef7d136
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development
							
							
							
							
							
						 | 
						
							2021-05-18 09:35:07 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a06f9937f
								
							
						 | 
						
							
							
								
								fixed paging
							
							
							
							
							
						 | 
						
							2021-05-18 09:30:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c411fe5e7e
								
							
						 | 
						
							
							
								
								caching fixes
							
							
							
							
							
						 | 
						
							2021-05-18 09:24:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								2809acc432
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-lms-open-olat' into development
							
							
							
							
							
							
							
							Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/olat/OlatLmsAPITemplate.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/olat/OlatLmsAPITemplateFactory.java 
							
						 | 
						
							2021-05-18 09:02:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								4cd05d5e2e
								
							
						 | 
						
							
							
								
								code cleanup
							
							
							
							
							
						 | 
						
							2021-05-18 09:01:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d111fd4f49
								
							
						 | 
						
							
							
								
								preparation for Ans Delft LMS binding implementation
							
							
							
							
							
						 | 
						
							2021-05-18 08:57:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e74ea1b7b
								
							
						 | 
						
							
							
								
								code cleanup
							
							
							
							
							
						 | 
						
							2021-05-18 08:46:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								1839d28df9
								
							
						 | 
						
							
							
								
								fixed for java 8
							
							
							
							
							
						 | 
						
							2021-05-17 22:48:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								89c306e35a
								
							
						 | 
						
							
							
								
								added OlatLmsAPITemplate skeleton ready to be implemented
							
							
							
							
							
						 | 
						
							2021-05-17 22:43:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								213cf443e1
								
							
						 | 
						
							
							
								
								simplified LMS API
							
							
							
							
							
						 | 
						
							2021-05-17 21:19:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b00995aa7
								
							
						 | 
						
							
							
								
								simplified LMS API
							
							
							
							
							
						 | 
						
							2021-05-17 19:26:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d8fb4b880
								
							
						 | 
						
							
							
								
								code cleanup
							
							
							
							
							
						 | 
						
							2021-05-17 14:36:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d4aa25a736
								
							
						 | 
						
							
							
								
								added update_time for lms-setup table and check cache for distributed
							
							
							
							
							
							
							
							setup 
							
						 | 
						
							2021-05-17 14:28:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec6bfaa9b9
								
							
						 | 
						
							
							
								
								code cleanup fixed tests
							
							
							
							
							
						 | 
						
							2021-05-17 12:19:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								aee94a761e
								
							
						 | 
						
							
							
								
								fixed tests
							
							
							
							
							
						 | 
						
							2021-05-17 12:08:07 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								c73fd355a4
								
							
						 | 
						
							
							
								
								test build
							
							
							
							
							
						 | 
						
							2021-05-17 11:14:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								6cb2f78759
								
							
						 | 
						
							
							
								
								fixing tests
							
							
							
							
							
						 | 
						
							2021-05-17 10:34:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								d182d7da87
								
							
						 | 
						
							
							
								
								fixed tests
							
							
							
							
							
						 | 
						
							2021-05-17 10:04:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								276fff7006
								
							
						 | 
						
							
							
								
								tests
							
							
							
							
							
						 | 
						
							2021-05-17 09:24:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								bb9d0b068d
								
							
						 | 
						
							
							
								
								caching and local tests working
							
							
							
							
							
						 | 
						
							2021-05-17 09:03:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								9214719642
								
							
						 | 
						
							
							
								
								refactoring of LMS API service with overall eh-caching
							
							
							
							
							
						 | 
						
							2021-05-15 17:43:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									anhefti
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd6150ec2a
								
							
						 | 
						
							
							
								
								refactoring and improvement of LMS binding API
							
							
							
							
							
						 | 
						
							2021-05-14 17:08:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 |