Commits · b8426e779cfc104d3bedc22005c706b64558d2c1 · fides / fltrail · GitLab

Snippets Groups Projects

Jul 17, 2018
- feat: extended functionalTests to Journal, Groupfinding and Assessment module · b8426e77
  Julian Dehne authored 6 years ago
  
  b8426e77
Jul 16, 2018
- bug: fixed problem in mocking · 6090088c
  Julian Dehne authored 6 years ago
  
  6090088c
- bug: fixed problem in mocking · 467f590d
  Julian Dehne authored 6 years ago
  
  467f590d
- bug: fixed problem in mocking · 380c7d34
  Julian Dehne authored 6 years ago
  
  380c7d34
- feat: implemented ProjectConfigurationDAO · f2c22726
  Julian Dehne authored 6 years ago
  
  f2c22726
Jul 13, 2018
- feat: added functional tests for the backend components · 76304b77
  Julian Dehne authored 6 years ago
  
  76304b77
Jul 10, 2018
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 13e8164f
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/scripts/dbschema/fltrail.sql
  13e8164f
- added rest service for phases · 62092928
  Julian Dehne authored 6 years ago
  
  62092928
- feat: implemented a central management class that allows for a project to be changed to a new phase · afa8b592
  Julian Dehne authored 6 years ago
  
  afa8b592
Jul 08, 2018
- Merge branch 'annotation_#47-4' into development_master · 4abef401
  Sven Kästle authored 6 years ago
  
  4abef401
- refactor: Change validation text · ed95a790
  Sven Kästle authored 6 years ago
  
  ed95a790
- feat: Implement logic of annotation creation process · ddec5417
  Sven Kästle authored 6 years ago
  
  ddec5417
Jul 07, 2018
- feat: Add first simple modal design with no functionality · a01a452e
  Sven Kästle authored 6 years ago
  
  a01a452e
Jul 06, 2018
- Merge branch 'annotation_#47-2' into development_master · f12cbd4e
  Sven Kästle authored 6 years ago
  
  f12cbd4e
- refactor: Update methods to newest version of annotation object · 5d81a410
  Sven Kästle authored 6 years ago
  
  5d81a410
- refactor: Adjust controller and test classes · 82724562
  Sven Kästle authored 6 years ago
  
  82724562
- fix: Add empty constructor · f776bdcc
  Sven Kästle authored 6 years ago
  
  Need this for REST requests
  f776bdcc
- refactor: Adjust annotation patch and post request · cf9b0f1e
  Sven Kästle authored 6 years ago
  
  cf9b0f1e
- refactor: Switch from simple body to new AnnotationBody · be5e4395
  Sven Kästle authored 6 years ago
  
  be5e4395
- feat: Add new AnnotationBody class and refactor the annotation class · 9e7292db
  Sven Kästle authored 6 years ago
  
  9e7292db
- fix: Switch from absolute to relative path · e23d05da
  Sven Kästle authored 6 years ago
  
  e23d05da
- started implementing state rules · eadc5fbf
  Julian Dehne authored 6 years ago
  
  eadc5fbf
Jul 05, 2018
- Merge branch 'pages_overview' of https://github.com/juliandehne/fltrail into pages_overview · 0e6a32a0
  Axel authored 6 years ago
  
  0e6a32a0
- fix: createProject as clickpath works · b399ae7d
  Axel authored 6 years ago
  
  b399ae7d
- Merge remote-tracking branch 'origin/pages_overview' into pages_overview · ad770281
  Thomas Schnaak authored 6 years ago
  
  ad770281
- fix: Journal tokens from url in js and html · 9293e52b
  Thomas Schnaak authored 6 years ago
  
  9293e52b
- Merge pull request #56 from juliandehne/merge-tester · 3893b68a
  Ludwig Weihmann authored 6 years ago
  
  Merge tester
  Unverified
  
  3893b68a
- merged pages_overview-gamification branch in and solved conflicts · adeb9014
  Ludwig Weihmann authored 6 years ago
  
  adeb9014
- fix: correct db-scheme · 3a7ea286
  Axel authored 6 years ago
  
  3a7ea286
- feat: reset fltrail.sql script · eea3bee8
  Ludwig Weihmann authored 6 years ago
  
  eea3bee8
- feat: added sql script file for gamification · 48294bdd
  Ludwig Weihmann authored 6 years ago
  
  48294bdd
- stash · 731cb8d6
  Axel authored 6 years ago
  
  731cb8d6
- stash · 90789a8a
  Axel authored 6 years ago
  
  90789a8a
- Merge branch 'PeerAssessmentAxel' into pages_overview · 526ce40b
  Axel authored 6 years ago
  
  526ce40b
Jul 04, 2018
- $DESKTOP-GQAQBS4\Admin's avatar$
  
  Merge branch 'pages_overview' of https://github.com/juliandehne/fltrail into pages_overview · 1a19756e
  DESKTOP-GQAQBS4\Admin authored 6 years ago
  
  1a19756e
- $DESKTOP-GQAQBS4\Admin's avatar$
  Merge branch 'Groupfinding_Miri' into pages_overview · 3047269f
  DESKTOP-GQAQBS4\Admin authored 6 years ago
  
  # Conflicts: # .idea/workspace.xml
  3047269f
- changed html in jsp · e9a95987
  quark authored 6 years ago
  
  e9a95987
- Merge branch 'researchreport' into pages_overview · fcc5063c
  quark authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/scripts/dbschema/fltrail.sql
  fcc5063c
- changed html in jsp · 5bd2a84d
  quark authored 6 years ago
  
  5bd2a84d
- changed html in jsp · 348ba8ac
  quark authored 6 years ago
  
  348ba8ac