anhefti
|
18f3764422
|
Merge branch 'development' into development_VDI
Conflicts:
src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java
src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java
src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnection.java
src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientConfigForm.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java
|
2021-02-02 10:45:25 +01:00 |
|
anhefti
|
977ada8947
|
SEBSERV-145 new attributes in Connection Configuration gui and back-end
|
2021-02-01 14:13:44 +01:00 |
|
anhefti
|
87951bdaaa
|
fixed sort in User Activity Logs for User column
|
2021-02-01 09:20:32 +01:00 |
|
anhefti
|
8bf00bf413
|
fixed some GUI issues
|
2021-01-27 17:24:30 +01:00 |
|
anhefti
|
199ba53688
|
SEBSERV-145 additional attributes in connection config
|
2021-01-27 16:57:10 +01:00 |
|
anhefti
|
4734b1a3b3
|
fixed GUI issues
|
2021-01-27 10:02:08 +01:00 |
|
anhefti
|
ff31692160
|
db schema update for distributed setup and a lot performance
improvements done with caching as well as with the monitoring table
This should now also work for distributed setups but is not fully tested
yet
|
2021-01-27 09:17:45 +01:00 |
|
anhefti
|
d4668eeeee
|
privileges
|
2021-01-21 15:21:46 +01:00 |
|
anhefti
|
c74cd42645
|
fixed export settings available also in readonly
|
2021-01-21 15:20:36 +01:00 |
|
anhefti
|
004c54a173
|
SEBSERV-142 fixes
|
2021-01-21 15:04:31 +01:00 |
|
anhefti
|
c3b767b7a0
|
updated wording as discussed
|
2021-01-20 17:48:01 +01:00 |
|
anhefti
|
6de13b3635
|
more compact actions
|
2021-01-13 13:53:44 +01:00 |
|
anhefti
|
5f969a22cf
|
SEBSERV-143 and SEBSERV-144
|
2021-01-13 11:58:30 +01:00 |
|
anhefti
|
a7e0dded7f
|
SEBSERV-142 fixed
|
2021-01-12 16:04:35 +01:00 |
|
anhefti
|
c5008ad5c2
|
SEBSERV-97 implementation
|
2021-01-12 15:14:05 +01:00 |
|
anhefti
|
eec4392f78
|
Added EHcache for caching and improved Moodle asnyc loading
|
2021-01-12 10:10:30 +01:00 |
|
anhefti
|
5f30aa9c2e
|
fixed bug with ad hoc testing LMS Setup in edit view
|
2021-01-12 09:55:49 +01:00 |
|
anhefti
|
433aad87df
|
SEBSERV-147: finished todos
|
2021-01-06 15:55:11 +01:00 |
|
anhefti
|
9941d57d44
|
SEBSERV-150 fixed filtering
|
2020-12-17 18:04:28 +01:00 |
|
anhefti
|
bd6cf929be
|
removed export exam config from exam view
|
2020-12-15 19:40:24 +01:00 |
|
anhefti
|
d3a794c5b1
|
fixed some tests and filtering
|
2020-12-15 17:53:21 +01:00 |
|
anhefti
|
0790b5827f
|
download name client config over exam
|
2020-12-14 17:20:37 +01:00 |
|
anhefti
|
39a90d201b
|
fixed moodle course filter
|
2020-12-14 12:40:13 +01:00 |
|
anhefti
|
34c8e2e33c
|
fixed tests
|
2020-12-10 21:01:30 +01:00 |
|
anhefti
|
4c002b4ac2
|
fixed various issues
|
2020-12-10 20:27:43 +01:00 |
|
anhefti
|
a502699774
|
Merge remote-tracking branch 'origin/master' into development
Conflicts:
pom.xml
|
2020-12-07 16:35:57 +01:00 |
|
anhefti
|
9b8840c779
|
added LmsType enabling
|
2020-12-03 10:38:02 +01:00 |
|
anhefti
|
23be314a44
|
SEBSERV-136 fixed inverse scaled indicator
|
2020-12-02 17:00:25 +01:00 |
|
anhefti
|
12fcaa405c
|
Merge remote-tracking branch 'origin/patch-1.0.2' into development
Conflicts:
src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionDetails.java
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/AbstractClientIndicator.java
|
2020-12-02 10:01:03 +01:00 |
|
anhefti
|
9f2cb493e0
|
added static column proportions for monitoring table
|
2020-12-02 09:49:52 +01:00 |
|
anhefti
|
5258f2384b
|
SEBSERV-136 fixed bug with two indicator of the same type.
The indicator mapping on GUI side is now done within the id not the type
|
2020-12-02 09:01:12 +01:00 |
|
anhefti
|
3052ec1f59
|
SEBSERV-147 GUI implementation
|
2020-12-01 11:46:41 +01:00 |
|
anhefti
|
a7a4b60917
|
SEBSERV-147 GUI implementation
|
2020-11-30 13:01:53 +01:00 |
|
anhefti
|
9267d34d3a
|
notification
|
2020-11-30 08:49:47 +01:00 |
|
anhefti
|
d3a372cfac
|
SEBSERV-136 SEBSERV-147 implementation and integration tests
|
2020-11-24 13:48:29 +01:00 |
|
anhefti
|
696a85a1fe
|
fixed some issues with proctoring rooms and error handling
|
2020-11-18 16:05:52 +01:00 |
|
anhefti
|
3b1641994a
|
Merge remote-tracking branch 'origin/patch-1.0.2' into development
Conflicts:
src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java
|
2020-11-17 17:29:06 +01:00 |
|
anhefti
|
797ebdd200
|
changed internal method name
|
2020-11-17 17:05:25 +01:00 |
|
anhefti
|
1d7bd02382
|
fixed concurrent user login within ServerPushService
|
2020-11-17 17:04:01 +01:00 |
|
anhefti
|
61cd109ff2
|
Merge remote-tracking branch 'origin/patch-1.0.2' into development
|
2020-11-17 12:36:59 +01:00 |
|
anhefti
|
1b9b201da9
|
minor message fix
|
2020-11-17 12:29:56 +01:00 |
|
anhefti
|
ff6e38d97f
|
SEBSERV-146 fixed
|
2020-11-17 12:28:21 +01:00 |
|
anhefti
|
10ef9792bc
|
fixed proctoring
|
2020-11-17 12:23:39 +01:00 |
|
anhefti
|
222edfade4
|
Merge remote-tracking branch 'origin/patch-1.0.2' into development
|
2020-11-12 17:01:20 +01:00 |
|
anhefti
|
e0ba0a9277
|
fix login error
|
2020-11-12 17:00:32 +01:00 |
|
anhefti
|
230b6edc9f
|
fixed logout error
|
2020-11-12 14:05:59 +01:00 |
|
anhefti
|
bee3f7a059
|
Merge remote-tracking branch 'origin/patch-1.0.2' into development
Conflicts:
src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java
|
2020-11-12 14:01:06 +01:00 |
|
anhefti
|
baee52a69a
|
fixed logout error bug
|
2020-11-12 13:52:26 +01:00 |
|
anhefti
|
53bb378d0b
|
SEBSERV-139 refactoring of townhall and instruction service
|
2020-11-12 13:28:03 +01:00 |
|
anhefti
|
8e04e43bfa
|
SEBSERV-139 refactoring and implementation of town hall
|
2020-11-10 15:35:47 +01:00 |
|