Commits · b78d2195b6efd2d019ff8276e0ff58cd0380e51f · fides / fltrail

Jul 08, 2018
- feat: connect Journal to DB · b78d2195
  tudtianus authored 6 years ago
  
  b78d2195
Jul 04, 2018
- fix: set link in menue, removed token from links(temporary) · 7d8d8439
  Thomas Schnaak authored 6 years ago
  
  7d8d8439
- fix: visual improvements · a94c7307
  Thomas Schnaak authored 6 years ago
  
  a94c7307
Jul 03, 2018
- fix: minor fixes · d98df504
  Thomas Schnaak authored 6 years ago
  
  d98df504
Jul 02, 2018
- refactor: Add 'back' buttons, merge three files to one, update feedback pages · c4d66579
  KKlaue authored 6 years ago
  
  c4d66579
Jul 01, 2018
- refactor: Add annotation page into the 'click chain' of feedback process · 6e615097
  Sven Kästle authored 6 years ago
  
  before: project-student.js --> givefeedback.jsp now: project-student.js --> annotation-document.jsp --> givefeedback.jsp
  6e615097
- refactor: New file name and add menu via tag · afe32ebb
  Sven Kästle authored 6 years ago
  
  afe32ebb
- feat: Add 'next' button to reach the next page · 924b4c40
  Sven Kästle authored 6 years ago
  
  924b4c40
- feat: add Buttons and Links · 23b80482
  KKlaue authored 6 years ago
  
  23b80482
- fix: java some cleanup · de507fd1
  tudtianus authored 6 years ago
  
  de507fd1
- fix: categorys · bc97b48d
  tudtianus authored 6 years ago
  
  bc97b48d
- fix: preload editor feat: Utility class for markdown conversion · ed7f7623
  tudtianus authored 6 years ago
  
  ed7f7623
- fix: modals for closeJournal and description · 2d2e57e9
  tudtianus authored 6 years ago
  
  2d2e57e9
Jun 30, 2018
- fix: journalFilter all new filters correct · e0280ebe
  tudtianus authored 6 years ago
  
  e0280ebe
- feat: tabs · 79e59488
  tudtianus authored 6 years ago
  
  79e59488
- feat: deleteLink button · b6da0ae4
  tudtianus authored 6 years ago
  
  b6da0ae4
- feat: addLink popup · d6136a2b
  tudtianus authored 6 years ago
  
  d6136a2b
- fix: buttons for "close" Journal, dummy functions for links, bootstrap buttons · 7cc8fe72
  tudtianus authored 6 years ago
  
  7cc8fe72
- fix: redirection in editdescription · 470d7b84
  tudtianus authored 6 years ago
  
  470d7b84
- fix: redirection in createJournal · 9f835d7b
  tudtianus authored 6 years ago
  
  9f835d7b
- feat: Limit Page size to viewport height and add scrollbar to list · da3a0336
  Sven Kästle authored 6 years ago
  
  da3a0336
- Feat: create Peerfeedback view · f8c0b208
  KKlaue authored 6 years ago
  
  f8c0b208
- fix: minor fixes · 2afd02ec
  Thomas Schnaak authored 6 years ago
  
  2afd02ec
Jun 28, 2018
- fix: rename Visibility none · 056b8594
  Thomas Schnaak authored 6 years ago
  
  056b8594
- fix: filter on eportfilio page · 44a7d2fb
  Thomas Schnaak authored 6 years ago
  
  44a7d2fb
- fix: filter on eportfilio page · 7d4b2b20
  Thomas Schnaak authored 6 years ago
  
  7d4b2b20
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 26, 2018
- feat: Add delete button to card if the annotation is from user · 3e0976b7
  Sven Kästle authored 6 years ago
  
  3e0976b7
Jun 24, 2018
- feat: Change color on annotation card hover · e733293d
  Sven Kästle authored 6 years ago
  
  e733293d
- fix: Add menu to e-portfolio page · 6d2eeb64
  tudtianus authored 6 years ago
  
  6d2eeb64
Jun 23, 2018
- feat: Add user color support for different users · 44cedec6
  Sven Kästle authored 6 years ago
  
  44cedec6
- feat: Implement toggle button functionality · 67819811
  Sven Kästle authored 6 years ago
  
  67819811
- feat: New annotation card design · 219bc82a
  Sven Kästle authored 6 years ago
  
  219bc82a
- fix: New response for 'addAnnotation' method · 5e2a8c64
  Sven Kästle authored 6 years ago
  
  5e2a8c64
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
Jun 21, 2018
- feat: hovering over an annotation will highlight the corresponding text · 318f992f
  Sven Kästle authored 6 years ago
  
  318f992f
- 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