zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1719 commits 10 branches 96 tags 34 MiB
Commit graph

1339 commits

Author SHA1 Message Date
anhefti
ea65d1e81c code analysis 2021-10-27 09:11:00 +02:00
anhefti
b06e6d5424 Fixed Zoom SDK JWT-Token generation 2021-10-25 13:31:05 +02:00
anhefti
5cf2547b86 Merge branch 'dev-lms-open-olat' into dev-1.2 2021-10-25 10:43:21 +02:00
Carol Alexandru
1449de217c don't construct json manually 2021-10-13 12:01:12 +02:00
Carol Alexandru
519ad5a9f8 authenticate with OLAT using POST instead of GET 2021-10-13 11:29:02 +02:00
anhefti
5b8d920a4f SEBSERV-160 more back-end implementation 2021-10-11 17:12:14 +02:00
anhefti
fa5aa6353c SEBSERV-160 new db schema and back-end implementation 2021-10-11 09:22:23 +02:00
anhefti
b1181bb97a Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/ExamAdminService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamAdminServiceImpl.java
 2021-10-07 10:50:59 +02:00
anhefti
020a885c1b fix: Zoom meetings created by ad-hoc users-accounts are now lizensed 
fix: Cleanup zoom rooms, meetings and ad-hoc users-accounts on exam
deletion and prevent SQL foreign constraint error on deletion process
when there are still living Zoom rooms for the exam.
 2021-10-07 09:30:00 +02:00
anhefti
67bd9bf647 SEBSERV-160 new db schema 2021-10-06 17:47:34 +02:00
anhefti
debc876da7 added batch_action table 2021-10-05 14:54:41 +02:00
anhefti
1a592ac606 SEBSERV-201 finished up 2021-09-30 15:45:57 +02:00
anhefti
f7a8fb4a33 SEBSERV-160 2021-09-30 14:59:20 +02:00
anhefti
d0407645d8 SEBSERV-175 implemented 2021-09-30 11:27:53 +02:00
anhefti
177d448e08 SEBSERV-160 2021-09-30 11:00:57 +02:00
anhefti
69c9de6d64 SEBSERV-155 implementation 2021-09-29 16:06:35 +02:00
anhefti
7817ed48c4 fixed migration 2021-09-29 13:37:34 +02:00
anhefti
7d7f458d82 SEBSERV-201 added migrations 2021-09-28 17:14:08 +02:00
anhefti
92207cf2c3 fixed tests 2021-09-27 10:48:58 +02:00
anhefti
33c915bd92 SEBSERV-230 removed attributes from GUI 2021-09-27 10:35:21 +02:00
anhefti
2fd3850186 Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	.github/workflows/buildReporting.yml
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
 2021-09-23 11:05:10 +02:00
anhefti
42993e3c97 fixed SEB session integrity check (allow multiple establish requests 
from same SEB client. This is usful when the SEB sends the userSessionId
multiple times)
 2021-09-23 09:30:40 +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
4b79662246 fixed integration tests 2021-09-21 16:19:48 +02:00
anhefti
4e3b397b28 fixed integration tests 2021-09-21 16:14:48 +02:00
anhefti
0bd6664255 fix integration tests 2021-09-21 16:03:47 +02:00
anhefti
ebdd938123 more unit and integration tests 2021-09-21 15:57:58 +02:00
anhefti
349303c168 fixed monitoring with no indicators 2021-09-21 14:43:41 +02:00
anhefti
fa0715b673 SEBSERV-162 fixes and better error handling 2021-09-21 14:38:45 +02:00
anhefti
9a00e9c1ab Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java
 2021-09-20 16:20:54 +02:00
anhefti
7d647cc9c2 fixed notification changes in GUI 2021-09-20 15:46:20 +02:00
anhefti
d897b91be9 integration tests for instruction service 2021-09-16 15:27:13 +02:00
anhefti
e3ac612fb3 Merge remote-tracking branch 'origin/dev-1.2' into development 2021-09-16 12:58:49 +02:00
anhefti
dffb0e61f8 fixed notification confirm for SEB also for delete 2021-09-16 11:55:36 +02:00
anhefti
0546b97b0a fixed notification confirm from SEB client 2021-09-16 11:33:25 +02:00
anhefti
c126056959 fixed notification confirmation form SEB side 2021-09-16 10:57:04 +02:00
anhefti
b0ad786c45 tests for instructions 2021-09-16 09:50:44 +02:00
anhefti
fe7f2bbaba Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/resources/messages.properties
 2021-09-16 08:44:05 +02:00
anhefti
c9ce66d89c code cleanup 2021-09-16 08:38:59 +02:00
anhefti
54a0f05a39 Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
 2021-09-16 08:37:34 +02:00
anhefti
cea62d5fa4 fixed instructions creation with attributes 2021-09-15 16:53:42 +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
f54b769388 better logging 2021-09-09 11:34:59 +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
c3eda2b81d Fixed Exam update task to not brake on single exam update error 2021-09-08 16:02:58 +02:00
anhefti
291a0e3532 code cleanup 2021-09-07 15:38:50 +02:00
anhefti
87e12a998e Correct some minor exam supporter rights 2021-09-07 13:27:07 +02:00
anhefti
0f7ef455e8 Added Zoom Client App integration for collecting rooms 2021-09-07 11:35:20 +02:00
anhefti
152955f712 SEBSERV-153 IndicatorTemplate implementation 2021-09-06 15:58:30 +02:00
anhefti
446bb15a9c added join URL for Zoom collecting rooms 2021-09-06 11:21:32 +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
c412fc3d97 Merge remote-tracking branch 'origin/dev-1.2' into development 2021-09-01 11:04:01 +02:00
anhefti
0061b27e75 update zoom web SDK to version 1.9.8, make version configurable 
removed unused libs for zoom web SDK (jQuery)
 2021-08-31 17:02:30 +02:00
anhefti
3143d9ed16 SEBSERV-162, SEBSERV-153 implementation break again... 2021-08-31 15:38:20 +02:00
anhefti
e49a713f72 Merge remote-tracking branch 'origin/dev-1.2' into development 2021-08-31 11:17:30 +02:00
anhefti
5c12b86b55 fixed unique name message 2021-08-31 11:16:28 +02:00
anhefti
6fdd4b11fe SEBSERV-162 implementation 2021-08-31 11:02:19 +02:00
anhefti
c7973d56ce SEBSERV-162, SEBSERV-153 extend db-model for features 2021-08-30 16:24:48 +02:00
anhefti
03300923c0 Merge remote-tracking branch 'origin/dev-1.2' into development 2021-08-30 13:14:16 +02:00
anhefti
ea9de0e60d set default LMSSetup type to "Testing" 2021-08-30 11:25:10 +02:00
anhefti
ac214401e1 Merge remote-tracking branch 'origin/dev-lms-ans' into dev-1.2 2021-08-30 11:12:44 +02:00
anhefti
6122331d6d fixed for Java 8 (replaced Map.of --> new HashMap<>()) 2021-08-30 11:03:27 +02:00
anhefti
8a72cf1fcd code review and cleanup (eclipse code formatting) 2021-08-30 10:55:59 +02:00
Carol Alexandru
6e31ad5e0e Retrieve start_url from Ans Assignment 2021-08-30 03:54:31 +02:00
anhefti
8d4272d2a0 changed Zoom API from 1.9.0 to 1.9.1 2021-08-26 20:30:56 +02:00
anhefti
81d6d132d6 remove Zoom join hook test 2021-08-26 16:27:38 +02:00
anhefti
40102be281 catch errors on SEB Settings value init for every single value 2021-08-26 14:54:51 +02:00
anhefti
8a2fa0cdcf fixed missing internalSecret mapping for gui service config 2021-08-25 17:11:16 +02:00
anhefti
2a5054906a Merge remote-tracking branch 'origin/dev-1.2' into development 2021-08-25 17:10:17 +02:00
anhefti
88b2311e08 SEBSERV-227 fixed sdkKey override 2021-08-25 15:44:55 +02:00
Carol Alexandru
b767178d75 Implement AnsLms integration 2021-08-17 06:06:58 +02:00
anhefti
6dacca72c3 Merge branch 'dev-1.2' into development 2021-08-12 16:49:11 +02:00
anhefti
6abfeb17a8 correct messages 2021-08-12 15:31:25 +02:00
anhefti
aeb614082c Merge branch 'proctoring_sdkkey' into dev-1.2 2021-08-12 13:34:52 +02:00
anhefti
ebf0fab2f0 added OLAT LMS for selection 2021-08-12 13:29:53 +02:00
anhefti
c743947912 Merge remote-tracking branch 'origin/dev-lms-open-olat' into dev-1.2 2021-08-12 11:13:37 +02:00
anhefti
dea65b70d2 more code cleaup 2021-08-12 11:10:58 +02:00
anhefti
1df182fae6 Merge remote-tracking branch 'origin/dev-lms-open-olat' into dev-1.2 2021-08-12 11:09:13 +02:00
anhefti
d1685f4675 some code cleanup 2021-08-12 10:55:28 +02:00
anhefti
ff7cc5b020 fixed nullpointer 2021-08-12 10:30:37 +02:00
anhefti
107b3beb35 fix build 2021-08-11 16:01:58 +02:00
anhefti
2dea3e2285 SEBSERV-138 fixed navigation and filter. Added more input field types 2021-08-11 15:58:48 +02:00
anhefti
c3b999fc4c Merge remote-tracking branch 'origin/dev-1.2' into development 2021-08-11 08:15:34 +02:00
anhefti
c2ab294ac0 minor config change 2021-08-10 15:16:36 +02:00
anhefti
52013752ea fixed tests code cleanup 2021-08-10 09:50:28 +02:00
anhefti
a6daba57a8 Merge branch 'dev-1.2' into development 2021-08-10 09:42:25 +02:00
anhefti
1eb7e957a9 SEBSERV-211 2021-08-10 09:41:11 +02:00
anhefti
43ca2f6ba9 SEBSERV-219 2021-08-10 09:38:16 +02:00
anhefti
eb45dcf0f3 added missing @Transactional to prevent committing without 
needs-confirmation attribute
 2021-08-09 11:11:49 +02:00
anhefti
dd41a85087 fixed dev setup (switch back to port 8080) 2021-08-09 10:20:29 +02:00
anhefti
76a1676b69 added update task to release aged exam record locks 2021-08-05 10:54:28 +02:00
anhefti
9d27dbfbcf Implement SDKToken for Zoom proctoring with SEB client for iOS and MacOS 2021-08-05 09:37:14 +02:00
anhefti
b0fecc2d7d SEBSERV-138 more ARIA improvements 2021-08-04 12:48:35 +02:00
anhefti
9a9ad6e840 code cleanup 2021-08-04 10:08:28 +02:00
anhefti
643c565b73 fixed time current millis 2021-08-03 18:26:19 +02:00
anhefti
9be252f333 added some tabindex fix scripts 2021-08-03 17:57:03 +02:00
Carol Alexandru
d627bb7edb fix silly beginner mistake 2021-08-03 09:52:02 +02:00
Carol Alexandru
8376a1c3fd minor cleanups 2021-08-03 07:27:57 +02:00
Carol Alexandru
0029cd4ec3 get OLAT token lazily when first needed, not upon instantiation 2021-07-30 14:19:53 +02:00
Carol Alexandru
59da4bcf4e minor improvements, re-use OlatLmsRestTemplate with existing token 2021-07-30 13:23:25 +02:00
anhefti
fe3a6519e0 Merge remote-tracking branch 'origin/rel-1.2.0' into development 2021-07-29 11:13:42 +02:00
anhefti
448a77cc90 Merge remote-tracking branch 'origin/rel-1.2.0' into dev-1.2 2021-07-29 11:13:00 +02:00
anhefti
dcb4eba7bf fixed tests 2021-07-29 10:50:05 +02:00
Carol Alexandru
ae5149226a generate proper exam url using updated OLAT api 2021-07-28 22:47:49 +02:00
Carol Alexandru
cdd393aecd Implement OlatLms integration 2021-07-28 15:21:22 +02:00
anhefti
a9810e3864 Merge remote-tracking branch 'origin/distributed-ping-cache' into 
dev-1.2

Conflicts:
	pom.xml
 2021-07-28 14:33:00 +02:00
anhefti
ed7ae28a0d fixed distributed ping cache 2021-07-28 14:29:21 +02:00
anhefti
cb6a3c5c08 SEBSERV-219 fixed logo 2021-07-26 10:10:26 +02:00
anhefti
64536fd909 distributed ping cache 2021-07-22 13:27:44 +02:00
anhefti
d96816311b SEBSERV-195 fixed ping caching 2021-07-21 11:32:04 +02:00
anhefti
2e7fb8e8dc fixed SEBSERV-220 and SEBSERV-221 2021-07-20 17:15:57 +02:00
anhefti
06bb48590b test commit 2021-07-20 10:20:05 +02:00
anhefti
59d811fda1 SEBSERV-215 fixed 2021-07-20 08:14:22 +02:00
anhefti
a59f5bd375 SEBSERV-212 fixed quizz mapping bug 2021-07-19 12:11:05 +02:00
anhefti
86f3b61272 SEBSERV-215 fixed missing tooltips 2021-07-19 11:16:56 +02:00
anhefti
3296b7c004 SEBSERV-195 improved ping indicator for distributed setups 2021-07-15 14:50:06 +02:00
anhefti
494c6a08ec SEBSERV-216 fixed 2021-07-15 13:42:14 +02:00
anhefti
7df04cddc6 SEBSERV-215 fixed 2021-07-15 12:26:12 +02:00
anhefti
bc1e933087 SEBSERV-209 fixed exam session service for distributed setup 
apply client connection sync check over time-interval (per exam) instead
of for every monitoring request and every client connection. So I
implemented batching for that to avoid heavy db load
 2021-07-15 07:52:06 +02:00
anhefti
885e39d1cc SEBSERV-210 fixed 2021-07-14 17:31:04 +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
ce270f3057 SEBSERV-208 fixed migration strategy for prod and distributed setup 2021-07-12 13:40:12 +02:00
anhefti
c043f0460e SEBSERV-204 removed "Audio Broadcast" button from Zoom Proc Window 2021-07-12 11:35:41 +02:00
anhefti
fe45a0357c SEBSERV-137 fixed --> 
"Connection requested" shall be considered as active SEB Client
 2021-07-12 11:27:52 +02:00
anhefti
e42336aa6a logging 2021-07-08 13:50:53 +02:00
anhefti
181fb6d95e SEBSERV-204 added collecting room restrictions (only one open at a time) 2021-07-08 13:08:47 +02:00
anhefti
e88f5146ab SEBSERV-135 fix 2021-07-07 17:36:27 +02:00
anhefti
bcdd8b87bd SEBSERV-202 fix 2021-07-07 17:30:56 +02:00
anhefti
6043d752a6 SEBSERV-204 fixes and improvements 2021-07-07 17:20:51 +02:00
anhefti
c7952b32bc SEBSERV-182 2021-07-07 13:24:38 +02:00
anhefti
c217d4d854 SEBSERV-182 2021-07-07 09:01:22 +02:00
anhefti
03c05c7372 SEBSERV-182 updateErrors 2021-07-07 08:46:41 +02:00
anhefti
5724a750b7 Zoom improvements and accessibility additions 2021-07-07 08:29:27 +02:00
anhefti
c8932e9ce8 removed Open OLAT and Ans again 2021-07-05 09:41:05 +02:00
anhefti
18a9e9f811 added SEB Settings Key: allowedDisplaysIgnoreFailure 2021-06-30 17:31:21 +02:00
anhefti
1e8ecd94ec SEBSERV-204 fix join instruction 2021-06-30 16:12:19 +02:00
anhefti
cbbff94a75 Merge remote-tracking branch 'origin/dev-lms-open-olat' into dev-1.2 2021-06-30 14:25:31 +02:00
anhefti
57dc15f64d Merge remote-tracking branch 'origin/dev-lms-ans' into dev-1.2 2021-06-30 14:25:14 +02:00
anhefti
03036ec8ee suppress warnings 2021-06-30 14:22:47 +02:00
anhefti
65d9957fae suppress warnings 2021-06-30 14:21:45 +02:00
anhefti
ec5d57e1c3 code cleanup 2021-06-30 14:16:58 +02:00
anhefti
80ff396383 removed ARIA Plugin 2021-06-30 14:10:34 +02:00
anhefti
0638bcafd6 SEBSERV-204 fixed 2021-06-30 13:18:34 +02:00
anhefti
2ae1b928f9 fixed tests 2021-06-29 15:15:48 +02:00
anhefti
3f319b2254 added leave meeting for proctor 2021-06-29 15:09:43 +02:00
anhefti
24d5c4feea SEBSERV-203 fixed 2021-06-29 13:26:21 +02:00
anhefti
d76f1f5ca9 SEBSERV-135 improved identity handling and error messages 2021-06-28 17:33:24 +02:00
anhefti
efa27fb7b6 adapted Zoom Window 2021-06-24 16:34:06 +02:00
anhefti
e49d8291d8 SEBSERV-202 implemented 2021-06-24 15:51:54 +02:00
anhefti
3f6bc5098d SEBSERV-58 point 6 2021-06-24 13:45:12 +02:00
anhefti
40b83111cb SEBSERV-58 fixed point 3 2021-06-24 11:57:03 +02:00
anhefti
2ad04e848a SEBSERV-58 fixed point 1 2021-06-24 10:58:51 +02:00
anhefti
bb1713da3c SEBSERV-184 fixes and migration script 2021-06-23 15:57:46 +02:00
anhefti
d2036a8598 disallow proctoring service change if there are existing proctoring 
rooms
 2021-06-22 14:26:08 +02:00
anhefti
8381b5d621 finished up to allow pings and instructions (quit) before connection 
is fully established (also in requested status)
 2021-06-21 17:30:10 +02:00
anhefti
b61166674c SEBSERV-137 fixed texts 2021-06-21 10:58:55 +02:00
anhefti
5c30db29b9 code cleanup 2021-06-21 10:34:46 +02:00
anhefti
73f8ab23bf SEBSERV-197 removed enableTouchExit attribute from GUI 2021-06-17 22:07:24 +02:00
anhefti
ee0960602c SEBSERV-137 implementation added texts and auto publish selection 2021-06-17 21:46:30 +02:00
anhefti
921e1959ce SEBSERV-197 fixed 2021-06-17 20:45:18 +02:00
anhefti
4ec882f039 fixed tests 2021-06-17 14:36:42 +02:00
anhefti
e88d2d9edd Jitsi integration: new access token creation for JaaS integration 2021-06-17 14:07:17 +02:00
anhefti
7360d8b99b code cleanup and docu 2021-06-17 08:49:51 +02:00
anhefti
31fbfa373c Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientNotificationServiceImpl.java
 2021-06-16 21:11:42 +02:00
anhefti
8e08351770 fixed notification performance 2021-06-16 21:06:12 +02:00
anhefti
5327d13502 todo 2021-06-16 17:30:23 +02:00
anhefti
812386c4c5 fixed tests 2021-06-16 14:35:15 +02:00
anhefti
0328a3b939 fixed tests 2021-06-16 14:29:51 +02:00
anhefti
bcb21da221 SEBSERV-138 ARIA plugin integration 
+ Database integrity checks
 2021-06-16 13:27:58 +02:00
anhefti
9a788cc495 fixed Zoom proctoring send meeting_id instead of roomName 2021-06-16 13:26:15 +02:00
anhefti
905fc5f47a fixed migration 2021-06-16 12:13:05 +02:00
anhefti
31809634f4 code cleanup 2021-06-16 12:11:25 +02:00
anhefti
0d9930ff8c fixed tests 2021-05-20 13:19:51 +02:00
anhefti
d203530757 fixed tests 2021-05-20 13:19:07 +02:00
anhefti
dd765e66bf integration preparation 2021-05-20 13:14:53 +02:00
anhefti
4dcb29e107 binding preparation 2021-05-20 13:10:12 +02:00
anhefti
cd4852b732 olat integration preparation 2021-05-20 12:52:56 +02:00
anhefti
58064de2e8 Ans integration preparation 2021-05-20 12:52:18 +02:00
anhefti
1c341af65c added setLargeVideoParticipant to proctor id on Jitsi window opening 2021-05-19 17:42:44 +02:00
anhefti
a0dbe72a1b some more preparation 2021-05-19 15:17:09 +02:00
anhefti
054a4f9e31 preparing 2021-05-19 14:59:10 +02:00
anhefti
a7d3b51005 OpenOLAT LMS binding preparation 2021-05-19 13:51:23 +02:00
anhefti
51078d11bb client instruction service improvements 2021-05-19 13:19:16 +02:00
anhefti
39e8846f64 Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamJITSIProctoringService.java
 2021-05-19 11:56:20 +02:00
anhefti
2ac17108d6 fixed caching issues evict only in distributed env 2021-05-19 11:31:39 +02:00
anhefti
8daf39a177 fixed cache issue 
do not evict the cache before get exams for institution otherwise
connecting SEB clients will always reload all running exams form
institution
 2021-05-19 11:06:50 +02:00
anhefti
b2a0016a9c fixed action activation 2021-05-18 15:41:32 +02:00
anhefti
a172326fa5 SEBSERV-180 fixes 2021-05-18 15:16:36 +02:00
anhefti
7a686c0e6e fixed cache cleanup 2021-05-18 12:02:27 +02:00
anhefti
a9fef7d136 Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development 2021-05-18 09:35:07 +02:00
anhefti
3a06f9937f fixed paging 2021-05-18 09:30:20 +02:00
anhefti
c411fe5e7e caching fixes 2021-05-18 09:24:28 +02:00
anhefti
2809acc432 Merge remote-tracking branch 'origin/dev-lms-open-olat' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/olat/OlatLmsAPITemplate.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/olat/OlatLmsAPITemplateFactory.java
 2021-05-18 09:02:23 +02:00