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
..
seb/sebserver	Merge branch 'development' into development_VDI	2021-02-02 10:45:25 +01:00