Merge remote-tracking branch 'origin/#40_dummyProjectCreation' into...
Merge remote-tracking branch 'origin/#40_dummyProjectCreation' into development_master_refactoring_1 # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java # gemeinsamforschen/src/scripts/dbschema/fltrail.sql
No related branches found
No related tags found
Showing
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java 7 additions, 2 deletions...c/main/java/unipotsdam/gf/core/management/Management.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java 37 additions, 22 deletions...in/java/unipotsdam/gf/core/management/ManagementImpl.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java.orig 389 additions, 0 deletions...va/unipotsdam/gf/core/management/ManagementImpl.java.orig
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/group/Group.java 6 additions, 3 deletions.../main/java/unipotsdam/gf/core/management/group/Group.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java 17 additions, 15 deletions...n/java/unipotsdam/gf/core/management/project/Project.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java.orig 165 additions, 0 deletions...a/unipotsdam/gf/core/management/project/Project.java.orig
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/User.java 7 additions, 7 deletions...rc/main/java/unipotsdam/gf/core/management/user/User.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/AssessmentView.java 1 addition, 70 deletions...gf/modules/assessment/controller/view/AssessmentView.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/service/GroupCreationService.java 1 addition, 3 deletions...gf/modules/groupfinding/service/GroupCreationService.java
- gemeinsamforschen/src/scripts/dbschema/createDummyUser.sql 17 additions, 25 deletionsgemeinsamforschen/src/scripts/dbschema/createDummyUser.sql
- gemeinsamforschen/src/scripts/dbschema/createDummyUsersGroupsProject.sql 54 additions, 0 deletions...en/src/scripts/dbschema/createDummyUsersGroupsProject.sql
- gemeinsamforschen/src/scripts/dbschema/fltrail.sql 4 additions, 11 deletionsgemeinsamforschen/src/scripts/dbschema/fltrail.sql
- gemeinsamforschen/src/scripts/dbschema/fltrail.sql.orig 165 additions, 123 deletionsgemeinsamforschen/src/scripts/dbschema/fltrail.sql.orig
- gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java 2 additions, 0 deletions...a/unipotsdam/gf/modules/assessment/TestAddAssessment.java
Loading
Please register or sign in to comment