Commits · b54809c53dae5de11b470af212812cd4efb2abba · fides / fltrail

Oct 15, 2018
- bugfixing: fixed small errors in annotation module · b54809c5
  Julian Dehne authored 6 years ago
  
  b54809c5
- bugfixing: fixed small errors in annotation module · bffa0292
  Julian Dehne authored 6 years ago
  
  bffa0292
- bugfix: fixed a lot of small issues · 9799b60a
  Julian Dehne authored 6 years ago
  
  - implemented gfm selection and dynamic user needed count - implemented minor changes in task handling
  9799b60a
Oct 12, 2018

bugfix: fixed a lot of small issues · 5996f617

Julian Dehne authored 6 years ago

- implemented gfm selection and dynamic user needed count
- implemented minor changes in task handling

5996f617

bugfix: fixed a lot of small issues · 5416188f

Julian Dehne authored 6 years ago

- implemented gfm selection and dynamic user needed count
- implemented minor changes in task handling

5416188f

Oct 11, 2018

bugfix: fixed a lot of small issues · 3e7fe5a8

Julian Dehne authored 6 years ago

- implemented gfm selection and dynamic user needed count
- implemented minor changes in task handling

3e7fe5a8

Oct 10, 2018
- feat: Implemented Tasks for GroupPhase · 7b69c1c6
  Julian Dehne authored 6 years ago
  
  7b69c1c6
- Merge remote-tracking branch 'origin/development_master' into development_master · 17ae98e5
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectDAO.java # gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/Task.java # gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java # gemeinsamforschen/src/test/java/unipotsdam/gf/process/tasks/GroupPhaseTaskTest.java
  17ae98e5
- feat: Implemented Tasks for GroupPhase · ddda5f81
  Julian Dehne authored 6 years ago
  
  ddda5f81
- refac: timeStamp in DB and Long in java for all timestamps · 8ebc0643
  Axel authored 6 years ago
  
  8ebc0643
- beautify: unnecessary imports deleted · 1a1db18b
  Axel authored 6 years ago
  
  1a1db18b
- Merge remote-tracking branch 'origin/development_master' into templating_tasks · 79cae355
  Axel authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/tasks/TaskDAO.java # gemeinsamforschen/src/test/resources/database/fltrail.sql
  79cae355
- fix: more TaskNames are supported in tasks-student.js. Task Deadline is Timestamp now · 7cf9096b
  Axel authored 6 years ago
  
  7cf9096b
Oct 09, 2018
- - implemented test-db for unit tests as a third implementation of mysqlconnect · 195d5f70
  Julian Dehne authored 6 years ago
  
  195d5f70
- feat: implementedTaskDAO, fixed bugs for waiting for participants · e53e242a
  Julian Dehne authored 6 years ago
  
  e53e242a
- 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