Commits · 393842c4bce024e0f427f6a4a69ace50d4b9c33c · fides / fltrail

Oct 09, 2018
- fix: templates are build from DB · 393842c4
  Axel authored 6 years ago
  
  393842c4
- Merge remote-tracking branch 'origin/templating_tasks' into development_master · a32520ab
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/tasks/TaskName.java
  a32520ab
- task template with buttons and extra TaskNames. · aaf8fba4
  Axel authored 6 years ago
  
  aaf8fba4
- feat: implementedTaskDAO, fixed bugs for waiting for participants · 7c4a309b
  Julian Dehne authored 6 years ago
  
  7c4a309b
- feat: implementedTaskDAO, fixed bugs for waiting for participants · 96df3f28
  Julian Dehne authored 6 years ago
  
  96df3f28
- Merge remote-tracking branch 'origin/templating_tasks' into development_master · 3803a0b6
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/tasks/TaskDAO.java
  3803a0b6
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 0e471cad
  Julian Dehne authored 6 years ago
  
  0e471cad
- feat: implementedTaskDAO · ea5df653
  Julian Dehne authored 6 years ago
  
  ea5df653
- feat: template in frontend is raw done · a8ec0c35
  Axel authored 6 years ago
  
  a8ec0c35
Oct 08, 2018
- feat: progress in templating tasks · bbfc7215
  Axel authored 6 years ago
  
  bbfc7215
- naming for task templates reworked · 80f40c76
  Axel authored 6 years ago
  
  80f40c76
- starting to implement templates for tasks · 25e33fbc
  Axel authored 6 years ago
  
  25e33fbc
- feat: menu and footer reworked. 2 new Tasks added to enum TaskName for groupPhase · 749f91f1
  Axel authored 6 years ago
  
  749f91f1
- Merge remote-tracking branch 'origin/development_master' into vertical_menu · 456638e1
  Axel authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
  456638e1
Oct 05, 2018

Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 4b442dc1

Julian Dehne authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/IJournalImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
#	gemeinsamforschen/src/main/webapp/core/overview-student.js
#	gemeinsamforschen/src/main/webapp/journal/js/create-journal.js
#	gemeinsamforschen/src/main/webapp/journal/js/eportfolio.js

4b442dc1

feat: implementedTaskDAO · fac0f2df
Julian Dehne authored 6 years ago

fac0f2df

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
- fix: overview-student links to next page · 10368205
  Axel authored 6 years ago
  
  10368205
- Merge branch 'development_master' into refactoring_Session · fdfd8951
  Julian Dehne authored 6 years ago
  
  fdfd8951
Sep 25, 2018
- Merge branch 'development_master' into IJournalImplementation · 336ed9a2
  Thomas Schnaak authored 6 years ago
  
  336ed9a2