Merge branch 'development_master' into IJournalImplementation
# Conflicts: # gemeinsamforschen/pom.xml # gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/IJournalImpl.java
No related branches found
No related tags found
Showing
- .gitignore.orig 0 additions, 26 deletions.gitignore.orig
- gemeinsamforschen/pom.xml 23 additions, 3 deletionsgemeinsamforschen/pom.xml
- gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java 17 additions, 2 deletions...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/MysqlConnect.java 152 additions, 143 deletions.../java/unipotsdam/gf/core/database/mysql/MysqlConnect.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java 8 additions, 49 deletions...c/main/java/unipotsdam/gf/core/management/Management.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java 35 additions, 257 deletions...in/java/unipotsdam/gf/core/management/ManagementImpl.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java.orig 0 additions, 389 deletions...va/unipotsdam/gf/core/management/ManagementImpl.java.orig
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/group/Group.java 32 additions, 3 deletions.../main/java/unipotsdam/gf/core/management/group/Group.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Footer.java 13 additions, 9 deletions.../unipotsdam/gf/core/management/pageAppearance/Footer.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java 11 additions, 9 deletions...nipotsdam/gf/core/management/pageAppearance/HeadLine.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java 45 additions, 41 deletions...va/unipotsdam/gf/core/management/pageAppearance/Menu.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/OmniDependencies.java 10 additions, 10 deletions...m/gf/core/management/pageAppearance/OmniDependencies.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectDAO.java 89 additions, 0 deletions...ava/unipotsdam/gf/core/management/project/ProjectDAO.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/HiddenUserTag.java 9 additions, 5 deletions...ava/unipotsdam/gf/core/management/user/HiddenUserTag.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java 0 additions, 0 deletions...rc/main/java/unipotsdam/gf/core/management/user/Menu.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/SessionValidator.java 8 additions, 3 deletions.../unipotsdam/gf/core/management/user/SessionValidator.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/User.java 15 additions, 0 deletions...rc/main/java/unipotsdam/gf/core/management/user/User.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserDAO.java 132 additions, 0 deletions...main/java/unipotsdam/gf/core/management/user/UserDAO.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java 27 additions, 17 deletions.../java/unipotsdam/gf/core/management/user/UserService.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/util/ResultSetUtil.java 18 additions, 0 deletions...ava/unipotsdam/gf/core/management/util/ResultSetUtil.java
Loading
Please register or sign in to comment