Commits · 49282790ff5be11fd7af2e9a0750da1d1c57f093 · fides / fltrail

Sep 03, 2018
- Added researchReport Overview Page · 49282790
  quark authored 6 years ago
  
  49282790
Jul 19, 2018
- #60 Fixed Upload · ceec00fc
  Johannes Zeiße authored 6 years ago
  
  ceec00fc
Jul 18, 2018
- Fix: Upload and Pages · 5887cfab
  quark authored 6 years ago
  
  5887cfab
- Added researchReport Overview Page · 3b0d4671
  quark authored 6 years ago
  
  3b0d4671
Jul 11, 2018
- Added File Upload (in Progress) · 0c0beffa
  quark authored 6 years ago
  
  0c0beffa
- Added File Upload (in Progress) · 3c9d1ee4
  quark authored 6 years ago
  
  3c9d1ee4
Jul 10, 2018
- Fix: Css Stylesheet · 6e46a3c1
  quark authored 6 years ago
  
  6e46a3c1
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
- $DESKTOP-GQAQBS4\Admin's avatar$
  
  no message · bb15960a
  DESKTOP-GQAQBS4\Admin authored 6 years ago
  
  bb15960a
- $DESKTOP-GQAQBS4\Admin's avatar$
  
  Views · 936d589d
  DESKTOP-GQAQBS4\Admin authored 6 years ago
  
  936d589d
- linked researchReport pages · ac8e44ce
  quark authored 6 years ago
  
  ac8e44ce
- feat: added more verbose debugging messages to VereinfachtesResultSet · bc003f9b
  Ludwig Weihmann authored 6 years ago
  
  bc003f9b
- Merge branch 'pages_overview-gamifiation' into pages_overview · 3f00dcdc
  Ludwig Weihmann authored 6 years ago
  
  With this a profile page is added to the side menu
  3f00dcdc
- feat: added scriplet to profile to get name · 3cd1e194
  Ludwig Weihmann authored 6 years ago
  
  3cd1e194
- fix: added tokens to links for clickdummy · bf0ce561
  Thomas Schnaak authored 6 years ago
  
  bf0ce561
- Merge remote-tracking branch 'origin/pages_overview' into pages_overview · b4a58836
  Thomas Schnaak authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
  b4a58836
- fix: set link in menue, removed token from links(temporary) · 7d8d8439
  Thomas Schnaak authored 6 years ago
  
  7d8d8439
- Merge remote-tracking branch 'remotes/origin/pages_overview' into Journal · cdbfae52
  Thomas Schnaak authored 6 years ago
  
  cdbfae52
- fix: visual improvements · a94c7307
  Thomas Schnaak authored 6 years ago
  
  a94c7307
- Merge branch 'annotation_#46-1' into pages_overview · b4f1f924
  Sven Kästle authored 6 years ago
  
  b4f1f924
- feat: Implement click path to upload-unstructured · d2e2cd8d
  Sven Kästle authored 6 years ago
  
  d2e2cd8d
Jul 03, 2018
- Merge branch 'annotation_#46' into pages_overview · 906004ac
  Sven Kästle authored 6 years ago
  
  906004ac
- refactor: Switch from html to jsp and add menu via tag · 053684ab
  Sven Kästle authored 6 years ago
  
  053684ab