zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
seb-server/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer
History
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
..
api Merge remote-tracking branch 'origin/dev-1.1.0' into development 2021-03-29 14:53:49 +02:00
oauth update Spring Boot version to 2.3.0.RELEASE 2021-02-02 17:58:40 +01:00
WebServiceSecurityConfig.java update Spring Boot version to 2.3.0.RELEASE 2021-02-02 17:58:40 +01:00
WebServiceShutdown.java code cleanup 2020-02-20 16:12:04 +01:00
WebServiceUserDetails.java SEBSERV-62 controller implementation and prepare for testing 2019-07-02 15:30:24 +02:00