Commit graph

322 commits

Author SHA1 Message Date
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
anhefti
46786af1d6 Merge remote-tracking branch 'origin/dev-1.2-pingCache' into dev-1.2
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/DistributedPingCache.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java
	src/main/resources/config/application-dev-ws.properties
2021-11-24 10:45:39 +01:00
anhefti
a88e308ba9 SEBSERV-194 better distributed ping handling (dedicated ThreadPool) 2021-11-24 09:59:43 +01:00
anhefti
3e35a7745b fixes and fine-tuning for distributed setup 2021-11-18 08:21:03 +01:00
anhefti
35905e9dad Merge remote-tracking branch 'origin/dev-1.2-isolateExamQuizLoad' into
development

Conflicts:
	pom.xml
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
2021-11-11 17:19:45 +01:00
anhefti
7de512d7fe synchronized running exam cache load to prevent multiple long running
transactions while loading an Exam
2021-11-11 16:01:35 +01:00
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
anhefti
f1dc16b5ef Merge remote-tracking branch 'origin/SEBSERV-191' into dev-1.2
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java
2021-11-08 13:13:10 +01:00
anhefti
06ce72a76f SEBSERV-191 gui implementation and download streaming 2021-11-04 16:52:48 +01:00
anhefti
c414586fec SEBSERV-191 finished back-end implementation 2021-11-03 13:18:40 +01:00
anhefti
2f2a3670b7 SEBSERV-191 backend implementation 2021-11-03 10:31:15 +01:00
anhefti
daeb118210 SEBSERV-239 2021-11-02 10:04:57 +01:00
anhefti
69c9de6d64 SEBSERV-155 implementation 2021-09-29 16:06:35 +02:00
anhefti
6fc54e5310 Merge remote-tracking branch 'origin/dev-1.2' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamDeletePopup.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/EntityController.java
2021-09-22 17:07:24 +02:00
anhefti
70358d0128 fixed session id, exam delete, ane better logs 2021-09-22 16:55:28 +02:00
anhefti
25265fdb2b SEBSERV-162 create exam from template and tests 2021-09-15 15:51:02 +02:00
anhefti
a589fd8ad4 SEBSERV-162 audit logs and deletion 2021-09-14 11:52:56 +02:00
anhefti
f794ab5e7d SEBSERV-162 implementations and test 2021-09-09 17:16:56 +02:00
anhefti
ef3a633ce1 SEBSERV-162 added institutional default flag 2021-09-09 10:21:36 +02:00
anhefti
36f546960b 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/ExamProctoringSettings.java
2021-09-08 16:10:36 +02:00
anhefti
87e12a998e Correct some minor exam supporter rights 2021-09-07 13:27:07 +02:00
anhefti
152955f712 SEBSERV-153 IndicatorTemplate implementation 2021-09-06 15:58:30 +02:00
anhefti
a081a38f84 SEBSERV-162 fixed db schema 2021-09-06 09:17:13 +02:00
anhefti
d469b30951 SEBSERV-162, SEBSERV-153 implementation 2021-09-02 17:12:19 +02:00
anhefti
3143d9ed16 SEBSERV-162, SEBSERV-153 implementation break again... 2021-08-31 15:38:20 +02:00
anhefti
64536fd909 distributed ping cache 2021-07-22 13:27:44 +02:00
anhefti
086bc5ef3b SEBSERV-212 prevent double-creation of exam for a quiz on the same
institution. Do also not forward and load the existing one. This seems
to cause some trouble when be done sometimes.
2021-07-14 16:33:33 +02:00
anhefti
eb7042acf6 SEBSERV-209 fixed indicators for distributed setup
also fixed instructions for distributed setup
2021-07-14 13:21:19 +02:00
anhefti
ef72400656 fixed setup for kuberneetes 2021-07-12 17:00:19 +02:00
anhefti
0638bcafd6 SEBSERV-204 fixed 2021-06-30 13:18:34 +02:00
anhefti
3f6bc5098d SEBSERV-58 point 6 2021-06-24 13:45:12 +02:00
anhefti
ee0960602c SEBSERV-137 implementation added texts and auto publish selection 2021-06-17 21:46:30 +02:00
anhefti
a172326fa5 SEBSERV-180 fixes 2021-05-18 15:16:36 +02:00
anhefti
0b00995aa7 simplified LMS API 2021-05-17 19:26:26 +02:00
anhefti
6cb2f78759 fixing tests 2021-05-17 10:34:21 +02:00
anhefti
9214719642 refactoring of LMS API service with overall eh-caching 2021-05-15 17:43:26 +02:00
anhefti
dd6150ec2a refactoring and improvement of LMS binding API 2021-05-14 17:08:29 +02:00
anhefti
0bda2cb292 Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientInstruction.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java
2021-05-12 17:37:08 +02:00
anhefti
d7e52efac9 added userid to pin for Jitsi broadcasting instruction 2021-05-12 13:39:09 +02:00
anhefti
a853c02947 SEBSERV-135 finished implementation 2021-05-12 09:50:58 +02:00
anhefti
8be642c31c SEBSERV-108 addes sort and default sort for all except lms lookup 2021-05-07 12:13:13 +02:00
anhefti
6bf1551028 certs impl 2021-05-04 21:59:04 +02:00
anhefti
3872e0f725 SEBSERV-135 gui 2021-04-30 13:32:22 +02:00
anhefti
89bb29ed4f SEBSERV-135 gui implementation and fixes 2021-04-28 17:12:17 +02:00
anhefti
18dce53170 SEBSERV-135 - gui implementation 2021-04-22 08:49:52 +02:00
anhefti
ab8ac01e05 SEBSERV-135 backend implementation 2021-04-21 14:16:44 +02:00
anhefti
33e6fab629 refactor create page form list (noSQL) 2021-04-20 16:21:21 +02:00
anhefti
813b1c84ba added check on creation 2021-04-20 16:19:55 +02:00
anhefti
ed8d98a40b fixed privilege check on createNew 2021-04-20 16:18:21 +02:00
anhefti
ec8f7c9258 code cleanup 2021-04-20 16:17:31 +02:00