Commits · e3fae2016779733cba3d1d6e6b12b07cf2cc291d · fides / fltrail

Oct 23, 2018

Merge remote-tracking branch 'origin/rocketChatApiImpl_#63' into development_master · e3fae201

Julian Dehne authored 6 years ago

# Conflicts:
#	gemeinsamforschen/pom.xml
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/ChatWindow.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/Messages.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/DummyProjectCreationService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/service/GroupDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/User.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/UserDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/UserView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/phases/PhasesImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/util/ResultSetUtil.java
#	gemeinsamforschen/src/main/webapp/profile/profile.jsp
#	gemeinsamforschen/src/main/webapp/project-docent.jsp
#	gemeinsamforschen/src/main/webapp/project-student.jsp
#	gemeinsamforschen/src/main/webapp/taglibs/gemeinsamForschen.tld
#	gemeinsamforschen/src/scripts/dbschema/createDummyUser.sql
#	gemeinsamforschen/src/test/java/unipotsdam/gf/core/management/group/GroupDAOTest.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/service/CommunicationDummyServiceTest.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/groupfinding/dummy/service/DummyProjectCreationServiceTest.java
#	gemeinsamforschen/src/test/resources/database/fltrail.sql

e3fae201

Oct 22, 2018
- - implementing the annotation module · 0e21662c
  Julian Dehne authored 6 years ago
  
  - back and continue button
  0e21662c
Oct 18, 2018
- bugfixing: fixed feedbackassignment · d5056428
  Julian Dehne authored 6 years ago
  
  d5056428
- bugfixing: fixed feedbackassignment · f47a9e89
  Julian Dehne authored 6 years ago
  
  f47a9e89
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · 4f77df33
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
  4f77df33
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · d709f1d3
  Axel authored 6 years ago
  
  d709f1d3
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · 171c7a4f
  Axel authored 6 years ago
  
  171c7a4f
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · faf60f24
  Axel authored 6 years ago
  
  faf60f24
- frontend annotation categories are checked before saved · a9549958
  Axel authored 6 years ago
  
  a9549958
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · f8fae505
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
  f8fae505
- bugfixing: fixed small errors in annotation module · cbd47ea9
  Julian Dehne authored 6 years ago
  
  cbd47ea9
- Merge commit 'd43f0681 ' into single-user-project · 194c92ea
  Axel authored 6 years ago
  
  194c92ea
- WIP on single-user-project: 6e19e34d assess-work works again · d43f0681
  Axel authored 6 years ago
  
  d43f0681
- index on single-user-project: 6e19e34d assess-work works again · d64809bf
  Axel authored 6 years ago
  
  d64809bf
Oct 17, 2018
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · 5f79e037
  Julian Dehne authored 6 years ago
  
  5f79e037
- bugfixing: fixed small errors in annotation module · 661d91b8
  Julian Dehne authored 6 years ago
  
  661d91b8
Oct 16, 2018
- assess-work works again · 6e19e34d
  Axel authored 6 years ago
  
  6e19e34d
Oct 15, 2018
- fix: long to timeStamp in DB. feat: finished closing phase task are shown correctly on tasks.jsp · 5bf2ac3c
  Axel authored 6 years ago
  
  5bf2ac3c
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · a3c65e6a
  Axel authored 6 years ago
  
  a3c65e6a
- minor buff in tasks.js · 0f207a53
  Axel authored 6 years ago
  
  0f207a53
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · 19247a83
  Julian Dehne authored 6 years ago
  
  19247a83
- bugfixing: fixed small errors in annotation module · d896f615
  Julian Dehne authored 6 years ago
  
  d896f615
- phase shift from course creation to dossierfeedback works · 8114d09a
  Axel authored 6 years ago
  
  8114d09a
- teacherTask and update tasks · cb2482e9
  Axel authored 6 years ago
  
  cb2482e9
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · c36a4ef4
  Axel authored 6 years ago
  
  c36a4ef4
- teacherTask and update tasks · d84c4604
  Axel authored 6 years ago
  
  d84c4604
- bugfixing: fixed small errors in annotation module · a786ac09
  Julian Dehne authored 6 years ago
  
  a786ac09
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · e46d4a2a
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/process/ProjectCreationProcess.java
  e46d4a2a
- Merge remote-tracking branch 'origin/single-user-project' into single-user-project · 3caf9862
  Axel authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
  3caf9862
- teacherTask and update tasks · 3c1d3b91
  Axel authored 6 years ago
  
  3c1d3b91
- 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
- Merge commit 'ba6a9494 ' into single-user-project · f759f39e
  Axel authored 6 years ago
  
  f759f39e
- get stash back!? · 02a320fa
  Axel authored 6 years ago
  
  02a320fa
- WIP on single-user-project: 5996f617 bugfix: fixed a lot of small issues · ba6a9494
  Axel authored 6 years ago
  
  ba6a9494
- index on single-user-project: 5996f617 bugfix: fixed a lot of small issues · 218e12df
  Axel authored 6 years ago
  
  218e12df
- 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