seb-server/src/main/java/ch/ethz/seb/sebserver
anhefti 6ff8b703c9 Merge remote-tracking branch 'origin/dev-1.1.0' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java
	src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/JitsiMeetProctoringView.java
	src/main/java/ch/ethz/seb/sebserver/gui/service/session/ProctoringGUIService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/RemoteProctoringRoomDAO.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/RemoteProctoringRoomDAOImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ExamProctoringRoomService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamProctoringRoomServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java
2021-03-29 14:53:49 +02:00
..
gbl Merge remote-tracking branch 'origin/dev-1.1.0' into development 2021-03-29 14:53:49 +02:00
gui Merge remote-tracking branch 'origin/dev-1.1.0' into development 2021-03-29 14:53:49 +02:00
webservice Merge remote-tracking branch 'origin/dev-1.1.0' into development 2021-03-29 14:53:49 +02:00
ClientHttpRequestFactoryService.java fixed moodle and proctoring 2020-09-29 17:48:50 +02:00
HTTPSRedirectServerFactory.java added creation_time to client connection and code-cleanup 2019-08-30 12:32:58 +02:00
SEBServer.java update Spring Boot version to 2.3.0.RELEASE 2021-02-02 17:58:40 +01:00
SEBServerInit.java fixed GUI service dependencies (to WebserviceInfo) 2020-06-09 14:44:29 +02:00
SEBServerInitEvent.java SEBSERV-74 implementation plus monitoring filter and features 2019-12-18 16:21:20 +01:00
WebSecurityConfig.java added check endpoint and fixed gui endpoint 2021-03-25 20:47:58 +01:00