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
..
content	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-11-10 13:25:26 +01:00
form	SEBSERV-162 fixes and better error handling	2021-09-21 14:38:45 +02:00
service	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-11-10 13:25:26 +01:00
table	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-11-10 13:25:26 +01:00
widget	SEBSERV-230 removed attributes from GUI	2021-09-27 10:35:21 +02:00
GuiInit.java	fixed working with context path for webservice and guiservice	2021-04-30 15:59:15 +02:00
GuiServiceInfo.java	fixed notification changes in GUI	2021-09-20 15:46:20 +02:00
GuiWebsecurityConfig.java	proctoring collecting rooms first implementation	2020-10-07 15:07:08 +02:00
InstitutionalAuthenticationEntryPoint.java	SEBSERV-219 fixed logo	2021-07-26 10:10:26 +02:00
ProctoringServlet.java	SEBSERV-204 fixed	2021-06-30 13:18:34 +02:00
RAPConfiguration.java	SEBSERV-204 fixes and improvements	2021-07-07 17:20:51 +02:00
RAPSpringConfig.java	Merge remote-tracking branch 'origin/patch-1.0.2' into development	2020-10-06 11:52:25 +02:00
StaticApplicationPropertyResolver.java	Merge remote-tracking branch 'origin/master' into development	2020-12-07 16:35:57 +01:00