Commits · 83122f460c4fdc11b3a2391d5b17ca86806f0845 · fides / fltrail

Oct 04, 2018
- horizontal menu · 83122f46
  Axel authored 6 years ago
  
  83122f46
- refactoring: switching to dependency injection and fixing tests · 71216264
  Julian Dehne authored 6 years ago
  
  71216264
- refactoring: switching to dependency injection and fixing tests · 206d65e8
  Julian Dehne authored 6 years ago
  
  206d65e8
- refactoring: switching to dependency injection and fixing tests · 46d402ea
  Julian Dehne authored 6 years ago
  
  46d402ea
- refactoring: switching to dependency injection and fixing tests · 0b56dc5c
  Julian Dehne authored 6 years ago
  
  0b56dc5c
Oct 02, 2018
- refactoring: switching to dependency injection and fixing tests · 4fe2113f
  Julian Dehne authored 6 years ago
  
  4fe2113f
- refactoring: switching to dependency injection and fixing tests · d46f0ea2
  Julian Dehne authored 6 years ago
  
  d46f0ea2
- Merge branch 'refactoring_Session' of https://github.com/juliandehne/fltrail ... · e35f8fe6
  Julian Dehne authored 6 years ago
  
  Merge branch 'refactoring_Session' of https://github.com/juliandehne/fltrail into refactoring_Session
  e35f8fe6
- refactoring: switching to dependency injection and fixing tests · 1b837a13
  Julian Dehne authored 6 years ago
  
  1b837a13
Oct 01, 2018
- fix: phase tests work again · c09272d3
  Axel authored 6 years ago
  
  c09272d3
- refactoring: switching to dependency injection and fixing tests · a0d25b31
  Julian Dehne authored 6 years ago
  
  a0d25b31
- fix: test phase4 works and DB-scheme updated · ce46394d
  Axel authored 6 years ago
  
  ce46394d
- refactoring: switching to dependency injection and fixing tests · 82ee72aa
  Julian Dehne authored 6 years ago
  
  82ee72aa
- fix projectName works in URL again in menu and from login to project-student · 3b3bbefe
  Axel authored 6 years ago
  
  3b3bbefe
- fix: projectName is not part of session but a part of the url · 1c5f5cec
  Axel authored 6 years ago
  
  1c5f5cec
- bugfix: ProjectDAO · a692582a
  Julian Dehne authored 6 years ago
  
  a692582a
Sep 28, 2018
- bugfix: ProjectDAO · c9332ac4
  Julian Dehne authored 6 years ago
  
  c9332ac4
Sep 27, 2018
- cleaned up some of the groupdao stuff that wasnt necessary or well written · d8800984
  Julian Dehne authored 6 years ago
  
  d8800984
- - feat: continued porting features from the existing group finding tool. · 68669500
  Julian Dehne authored 6 years ago
  
  68669500
Sep 26, 2018
- Merge branch 'refactoring_Session' of https://github.com/juliandehne/fltrail ... · 33bd9a4b
  Julian Dehne authored 6 years ago
  
  Merge branch 'refactoring_Session' of https://github.com/juliandehne/fltrail into refactoring_Session
  33bd9a4b
- fix: login works with sessions again · a7c1f60a
  Axel authored 6 years ago
  
  a7c1f60a
- Merge branch 'development_master' into refactoring_Session · fdfd8951
  Julian Dehne authored 6 years ago
  
  fdfd8951
Sep 25, 2018
- feat: URL-stuff replaced by session · b8b2463c
  Axel authored 6 years ago
  
  b8b2463c
- - feat: continued porting features from the existing group finding tool. · 59cbb742
  Julian Dehne authored 6 years ago
  
  59cbb742
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 2407ded4
  Axel authored 6 years ago
  
  2407ded4
- feat: dynamic loading of overview-student · 6f08ab43
  Axel authored 6 years ago
  
  6f08ab43
- - feat: continued porting features from the existing group finding tool. · 9d0d25e2
  Julian Dehne authored 6 years ago
  
  9d0d25e2
Sep 24, 2018

feat: projects on overview-student are built from DB · 7fd182f8
Axel authored 6 years ago

7fd182f8
- feat: continued porting features from the existing group finding tool. · ed9501df
Julian Dehne authored 6 years ago

ed9501df
Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · b0084232
Julian Dehne authored 6 years ago
```
# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectView.java
```
b0084232
- feat: continued porting features from the existing group finding tool. · eb0deab4
Julian Dehne authored 6 years ago

eb0deab4
refac: author column in projects is called authorEmail now · 05a31d1f
Axel authored 6 years ago
```
refac: OmniDependencies carrys taginputs
```
05a31d1f
fix: repairing the merge · fe4969b7
Axel authored 6 years ago

fe4969b7

Merge remote-tracking branch 'origin/development_master' into PhaseShifter · 438e6324

Axel authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/AssessmentView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/dummy/service/DummyProjectCreationService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/view/GroupView.java
#	gemeinsamforschen/src/main/webapp/assessment/js/Quiz-docent.js
#	gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js
#	gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js
#	gemeinsamforschen/src/main/webapp/core/utility.js
#	gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
#	gemeinsamforschen/src/main/webapp/management/join-project.jsp
#	gemeinsamforschen/src/main/webapp/management/js/overview-docent.js
#	gemeinsamforschen/src/main/webapp/management/js/overview-student.js
#	gemeinsamforschen/src/main/webapp/management/js/project-student.js
#	gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/ManagementTest.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java

438e6324

feat: check if project exists for joining it · d6b7b84c
Axel authored 6 years ago

d6b7b84c
Merge branch 'development_master_refactoring_1' into PhaseShifter · 26ac99a2
Axel authored 6 years ago

26ac99a2
fix: edit-group-settings links to next page · f73ebd08
Axel authored 6 years ago

f73ebd08

Sep 22, 2018

remove .orig files · 7dade02d
Martin Staehr authored 6 years ago

7dade02d
#40 fix merge error · 4b0c34f1
Martin Staehr authored 6 years ago

4b0c34f1

Merge remote-tracking branch 'origin/development_master' into #40_dummyProjectCreation · d2f060da

Martin Staehr authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/model/Constraints.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
#	gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
#	gemeinsamforschen/src/main/webapp/management/js/changePhase.js

d2f060da