-
- Downloads
Merge remote-tracking branch 'origin/development_master' into PeerAssessmentChristian_2
# Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java # gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js # gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 2 deletions.gitignore
- gemeinsamforschen/pom.xml 35 additions, 1 deletiongemeinsamforschen/pom.xml
- gemeinsamforschen/src/main/java/unipotsdam/gf/assignments/Assignee.java 15 additions, 0 deletions...hen/src/main/java/unipotsdam/gf/assignments/Assignee.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/assignments/NotImplementedLogger.java 69 additions, 0 deletions.../java/unipotsdam/gf/assignments/NotImplementedLogger.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java 14 additions, 5 deletions...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java 8 additions, 0 deletions...rc/main/java/unipotsdam/gf/config/GFRocketChatConfig.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/MysqlConnect.java 12 additions, 0 deletions.../java/unipotsdam/gf/core/database/mysql/MysqlConnect.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java 5 additions, 0 deletions...c/main/java/unipotsdam/gf/core/management/Management.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java 17 additions, 34 deletions...in/java/unipotsdam/gf/core/management/ManagementImpl.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java 14 additions, 1 deletion...n/java/unipotsdam/gf/core/management/project/Project.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectConfiguration.java 66 additions, 0 deletions...sdam/gf/core/management/project/ProjectConfiguration.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectConfigurationDAO.java 128 additions, 0 deletions...m/gf/core/management/project/ProjectConfigurationDAO.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java 15 additions, 9 deletions...rc/main/java/unipotsdam/gf/core/management/user/Menu.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/headLine.java 63 additions, 0 deletions...ain/java/unipotsdam/gf/core/management/user/headLine.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/omniDependencies.java 35 additions, 0 deletions.../unipotsdam/gf/core/management/user/omniDependencies.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/session/ContextTag.java 27 additions, 0 deletions.../src/main/java/unipotsdam/gf/core/session/ContextTag.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/session/GFContext.java 77 additions, 0 deletions...n/src/main/java/unipotsdam/gf/core/session/GFContext.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/session/SessionTag.java 51 additions, 0 deletions.../src/main/java/unipotsdam/gf/core/session/SessionTag.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java 4 additions, 9 deletions...n/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/testsandbox/TestList.java 6 additions, 0 deletions...rc/main/java/unipotsdam/gf/core/testsandbox/TestList.java
Loading
Please register or sign in to comment