Commits · ed9501df2e0268929ef3e414a885ea0f669731a8 · fides / fltrail

Sep 24, 2018

- feat: continued porting features from the existing group finding tool. · ed9501df
Julian Dehne authored 6 years ago

ed9501df
Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · b0084232
Julian Dehne authored 6 years ago
```
# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectView.java
```
b0084232
- feat: continued porting features from the existing group finding tool. · eb0deab4
Julian Dehne authored 6 years ago

eb0deab4
refac: author column in projects is called authorEmail now · 05a31d1f
Axel authored 6 years ago
```
refac: OmniDependencies carrys taginputs
```
05a31d1f
fix: repairing the merge · fe4969b7
Axel authored 6 years ago

fe4969b7

Merge remote-tracking branch 'origin/development_master' into PhaseShifter · 438e6324

Axel authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/AssessmentView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/dummy/service/DummyProjectCreationService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/view/GroupView.java
#	gemeinsamforschen/src/main/webapp/assessment/js/Quiz-docent.js
#	gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js
#	gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js
#	gemeinsamforschen/src/main/webapp/core/utility.js
#	gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
#	gemeinsamforschen/src/main/webapp/management/join-project.jsp
#	gemeinsamforschen/src/main/webapp/management/js/overview-docent.js
#	gemeinsamforschen/src/main/webapp/management/js/overview-student.js
#	gemeinsamforschen/src/main/webapp/management/js/project-student.js
#	gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/ManagementTest.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java

438e6324

feat: check if project exists for joining it · d6b7b84c
Axel authored 6 years ago

d6b7b84c
Merge branch 'development_master_refactoring_1' into PhaseShifter · 26ac99a2
Axel authored 6 years ago

26ac99a2
fix: edit-group-settings links to next page · f73ebd08
Axel authored 6 years ago

f73ebd08

Sep 22, 2018

remove .orig files · 7dade02d
Martin Staehr authored 6 years ago

7dade02d
#40 fix merge error · 4b0c34f1
Martin Staehr authored 6 years ago

4b0c34f1

Merge remote-tracking branch 'origin/development_master' into #40_dummyProjectCreation · d2f060da

Martin Staehr authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/model/Constraints.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
#	gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
#	gemeinsamforschen/src/main/webapp/management/js/changePhase.js

d2f060da

#40 fix dependency injection bugs · 5e3d4a7f
Martin Staehr authored 6 years ago

5e3d4a7f

Sep 21, 2018
- - feat: continued porting features from the existing group finding tool. · bd2e2bb4
  Julian Dehne authored 6 years ago
  
  bd2e2bb4
Sep 20, 2018
- #40 merge both GroupDAO classes and adjust other classes accordingly · cd8ef0be
  Martin Staehr authored 6 years ago
  
  cd8ef0be
- #40 fix: change sql queries for new database layout · 2a073ee1
  Martin Staehr authored 6 years ago
  
  2a073ee1
- nothing happened · 5e5cd82a
  Axel authored 6 years ago
  
  5e5cd82a
Sep 19, 2018
- - feat: continued porting features from the existing group finding tool. · 4830d616
  Julian Dehne authored 6 years ago
  
  4830d616
- feat finalize course works kinda. · e9a21c11
  Axel authored 6 years ago
  
  e9a21c11
- - still porting group and project creation [in progress] · 0551dee3
  Julian Dehne authored 6 years ago
  
  0551dee3
- fix: minor bug fixes in menu · 189ed6e9
  Axel authored 6 years ago
  
  189ed6e9
Sep 18, 2018
- beaut + feat: deleting unnecessary Classes, finalizeAssessment triggers after... · 73c4e7a8
  Axel authored 6 years ago
  
  beaut + feat: deleting unnecessary Classes, finalizeAssessment triggers after its safe that everyone assessed
  73c4e7a8
- - still porting group and project creation [in progress] · 896daa4b
  Julian Dehne authored 6 years ago
  
  896daa4b
- finding lost file "edit-description" · efe7b1d8
  Axel authored 6 years ago
  
  efe7b1d8
- fix: create quiz works again · 97bcd89e
  Axel authored 6 years ago
  
  97bcd89e
- Merge remote-tracking branch 'origin/development_master' into development_master_refactoring_1 · 240d8b77
  Julian Dehne authored 6 years ago
  
  240d8b77
- fix: change-phase can just quit the current phase now. · 660820b5
  Axel authored 6 years ago
  
  660820b5
Sep 17, 2018
- #40 add separate log file for tests to set level to error · db01e6db
  Martin Staehr authored 6 years ago
  
  db01e6db
- #40 set port to 0 for finding free port automatically · 5f34218c
  Martin Staehr authored 6 years ago
  
  5f34218c
- #40 fix: fix merge errors · f3138312
  Martin Staehr authored 6 years ago
  
  f3138312
- Merge remote-tracking branch 'origin/development_master' into #40_dummyProjectCreation · 1c079805
  Martin Staehr authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java # gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesService.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java # gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/PhaseTest.java # gemeinsamforschen/src/test/resources/database/fltrail.sql
  1c079805
- fix: fix injection · 301621f7
  Martin Staehr authored 6 years ago
  
  301621f7
- Merge remote-tracking branch 'origin/development_master' into PhaseShifter · f18b9737
  Axel authored 6 years ago
  
  f18b9737
- feat: phase shift works with condition check. feedback check is the last dummy. · 0925673a
  Axel authored 6 years ago
  
  0925673a
Sep 16, 2018
- #40 fix: problem with different logger · ba2f55c4
  Martin Staehr authored 6 years ago
  
  ba2f55c4
- #40 feat: implement dummyProjectCreationService test; fix: groupDAO persist · f7664e00
  Martin Staehr authored 6 years ago
  
  f7664e00
Sep 15, 2018
- #40 feat: implement last tests for groupDAO; fix bugs; implement update for group · 680726ed
  Martin Staehr authored 6 years ago
  
  680726ed
Sep 14, 2018
- refac: Constraint Messages are prepared and should be given back on phase Shift control · 560f7315
  Axel authored 6 years ago
  
  560f7315
Sep 13, 2018
- #40 feat: creating tests for DAOs · 7fb26428
  Martin Staehr authored 6 years ago
  
  7fb26428
- #40 fix: fixing bugs(typo, sql query) in groupDAO · f0ba72aa
  Martin Staehr authored 6 years ago
  
  f0ba72aa