seb-server/src/main/resources
anhefti 9896258afc Merge remote-tracking branch 'origin/dev-1.2' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/ProctorRoomConnectionsPopup.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientEvents.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientEventController.java
2021-11-10 13:25:26 +01:00
..
ch/ethz/seb/sebserver/gui/service/session/proctoring update zoom web SDK to version 1.9.8, make version configurable 2021-08-31 17:02:30 +02:00
config Merge remote-tracking branch 'origin/dev-1.2' into development 2021-11-10 13:25:26 +01:00
org/eclipse/swt/internal SEBSERV-30 LmsSetup list and form; fixed tests and code cleanup 2019-03-07 12:10:48 +01:00
static SEBSERV-138 fixed navigation and filter. Added more input field types 2021-08-11 15:58:48 +02:00
.gitignore SEBSERV-2 #project and configuration setup 2018-11-14 13:58:27 +01:00
logback-spring.xml added update task to release aged exam record locks 2021-08-05 10:54:28 +02:00
messages.properties Merge remote-tracking branch 'origin/dev-1.2' into development 2021-11-10 13:25:26 +01:00