Commits · 4593fefeeada3c7f797c95bc0ebae073f80fc410 · fides / fltrail

Jun 27, 2018
- feat: Add page to edit projectdescription · 4593fefe
  tudtianus authored 6 years ago
  
  4593fefe
- fix: Add menu to createJournal page · 7ce0c286
  tudtianus authored 6 years ago
  
  7ce0c286
Jun 24, 2018
- fix: Add menu to e-portfolio page · 6d2eeb64
  tudtianus authored 6 years ago
  
  6d2eeb64
Jun 22, 2018
- fix: Add menu to e-portfolio page · 71a9cdcc
  tudtianus authored 6 years ago
  
  71a9cdcc
- fix: repairs after dev_master merge · 19503a28
  tudtianus authored 6 years ago
  
  19503a28
- Merge remote-tracking branch 'remotes/origin/development_master' into Journal · dd02566e
  tudtianus authored 6 years ago
  
  dd02566e
Jun 21, 2018
- fix: renaming for getUserByToken() · cf9d3b72
  Axel authored 6 years ago
  
  cf9d3b72
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 80cf2a5b
  Axel authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java # gemeinsamforschen/src/main/webapp/pages/overview-docent.html # gemeinsamforschen/src/main/webapp/pages/overview-student.html
  80cf2a5b
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 83cbbd7e
  Axel authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java # gemeinsamforschen/src/main/webapp/pages/overview-docent.html # gemeinsamforschen/src/main/webapp/pages/overview-student.html
  83cbbd7e
- feat: get Token from url and reach it to next page works for overview-docent and -student. · 101938cc
  Axel authored 6 years ago
  
  fix: userToken was not written to url during login
  101938cc
- Merge branch 'communication' into development_master · 9bbae0ff
  Martin Stähr authored 6 years ago
  
  # Conflicts: # .gitignore # gemeinsamforschen/src/scripts/dbschema/fltrail.sql
  9bbae0ff
- format sql database sheet · f76f847d
  Martin Stähr authored 6 years ago
  
  f76f847d
- feat: update sql database schema of communication branch · 8e958114
  Martin Stähr authored 6 years ago
  
  8e958114
- gitignore. sry guys for losing settings =D · 2e9d400f
  Axel authored 6 years ago
  
  2e9d400f
- Merge branch 'PeerAssessmentAxel' into development_master · 711bb130
  Axel authored 6 years ago
  
  # Conflicts: # .gitignore
  711bb130
Jun 20, 2018
- refactor: Category, ExampleFeedback, Peer2PeerFeedback (little changes) · 44be9a83
  KKlaue authored 6 years ago
  
  44be9a83
Jun 19, 2018
- feat: first views for quizzes and rating of peer workethics. · 0d2af485
  Axel authored 6 years ago
  
  html mutates to jsp step by step. first step
  0d2af485
Jun 17, 2018
- Merge branch 'annotation' into development_master · f7e06075
  Sven Kästle authored 6 years ago
  
  f7e06075
- refactor: No need for gson and refactored the annotation REST paths · 60e889f3
  Sven Kästle authored 6 years ago
  
  60e889f3
- feat: use rest to load content of html pages · a79c07b7
  tudtianus authored 6 years ago
  
  a79c07b7
- fix: fixing tests #40 · 8ec083e0
  Martin Stähr authored 6 years ago
  
  8ec083e0
- feat: start implementing groupCreationDummy #40 · f2e6f8e6
  Martin Stähr authored 6 years ago
  
  chore: adding todos
  f2e6f8e6
- refactor: remove not needed comparison #40 · 5b5c8dc9
  Martin Stähr authored 6 years ago
  
  next method returns false, if it is on the end of the list
  5b5c8dc9
- feat: implement exist for project #40 · 93119e83
  Martin Stähr authored 6 years ago
  
  93119e83
- fix: getProjectsById sql query · 4c2f4472
  Martin Stähr authored 6 years ago
  
  4c2f4472
- fix: fix active and adminPassword naming in sql query · 6af62ece
  Martin Stähr authored 6 years ago
  
  6af62ece
- fix: fix group database creation · 0939fe85
  Martin Stähr authored 6 years ago
  
  fix: fix naming for Project active feat: implement getUserByField/getUserByEmail/getProjectById refactor: camelcase for adminPassword
  0939fe85
- feat: adding chatRoomId for groupChats for later use · 529200fa
  Martin Stähr authored 6 years ago
  
  529200fa
- fix: fixing create of group user table, because of wrong id · 840bcad3
  Martin Stähr authored 6 years ago
  
  840bcad3
Jun 16, 2018
- refactor: rename getUser to getUserByToken to implement other functions · f4838c48
  Martin Stähr authored 6 years ago
  
  f4838c48
- fix: add UNIQUE for email · 1817ca71
  Martin Stähr authored 6 years ago
  
  email have to be unique, because it identifies a user
  1817ca71
- test: add test for update function · ab5aa8ce
  Martin Stähr authored 6 years ago
  
  ab5aa8ce
- feat: add user registration and login procedure for chat · 8ecf02e0
  Martin Stähr authored 6 years ago
  
  feat: add update for user database entry
  8ecf02e0
- fix: updated css grid · 1c7adcca
  tudtianus authored 6 years ago
  
  1c7adcca
- fix: add missing database fields to user · bcd05473
  Martin Stähr authored 6 years ago
  
  bcd05473
- feat: added e-portfolio page (no functionality) · db89b7df
  tudtianus authored 6 years ago
  
  db89b7df
- adding .idea folder to .gitignore for each subproject, because it's only... · a8d949e9
  Martin Stähr authored 6 years ago
  
  adding .idea folder to .gitignore for each subproject, because it's only folder for IDE configuration
  a8d949e9
- fix: removed workspace.xml from git repository · a08a5122
  Martin Stähr authored 6 years ago
  
  It only contains IDE configuration which shouldn't be in a repository
  a08a5122
- fix: fixing entry point of problem of app · 0901c44d
  Martin Stähr authored 6 years ago
  
  0901c44d
- fix: adding .idea folder to ignore list for every subfolder · edfe99f4
  Martin Stähr authored 6 years ago
  
  It only contains IDE settings which shouldn't be in source control anyway
  edfe99f4