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/gui/service
History
anhefti c9a1c3a019 Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/test/resources/application-test.properties
2021-11-24 13:34:14 +01:00
..
examconfig SEBSERV-201 finished up 2021-09-30 15:45:57 +02:00
i18n SEBSERV-148 GUI Exam Config impl 2021-04-06 18:44:36 +02:00
page Merge remote-tracking branch 'origin/dev-1.2' into development 2021-11-24 13:34:14 +01:00
push fixed notification changes in GUI 2021-09-20 15:46:20 +02:00
remote Merge remote-tracking branch 'origin/dev-1.2' into development 2021-11-24 13:34:14 +01:00
session Merge remote-tracking branch 'origin/dev-1.2' into development 2021-11-01 09:49:35 +01:00
ResourceService.java SEBSERV-162 create exam from template and tests 2021-09-15 15:51:02 +02:00