|
|
4289bac410
|
Fixed UserService filter
|
2014-03-06 15:53:30 +01:00 |
|
|
|
b8289e3679
|
Removed RoleBuilder.
|
2014-03-06 15:33:01 +01:00 |
|
|
|
d615293e32
|
wtf constructor injection plz
|
2014-03-06 15:30:47 +01:00 |
|
|
|
3c84dac775
|
Removed Examiner repo and role reference.
|
2014-03-06 15:30:39 +01:00 |
|
|
|
863431d4c8
|
Changed examiner in FinalSeminar to User.
|
2014-03-06 15:25:17 +01:00 |
|
|
|
25d27e71db
|
Removed SupervisorRepo
|
2014-03-06 15:14:02 +01:00 |
|
|
|
03a5905008
|
Removed StudentRepo
|
2014-03-06 15:08:48 +01:00 |
|
Emil Siverhall
|
3a8f8207a2
|
findByCode that still lives on does not take inacticated project types in account
|
2014-03-06 15:06:58 +01:00 |
|
|
|
bef2d3843f
|
Removed RoleService.
|
2014-03-06 15:01:46 +01:00 |
|
Emil Siverhall
|
d203860919
|
removed use of findByCode in data initializer
|
2014-03-06 14:55:16 +01:00 |
|
|
|
45127ec63e
|
View updated to use role enums.
|
2014-03-06 14:42:58 +01:00 |
|
Emil Siverhall
|
8f39128207
|
removed projectType connection from ProjectPartner since this never was used
|
2014-03-06 13:37:13 +01:00 |
|
|
|
b95008eb16
|
Rewrote SupervisorService to work with User.
|
2014-03-06 10:25:29 +01:00 |
|
|
|
368560d883
|
Removed Employee from core.
|
2014-03-06 10:12:40 +01:00 |
|
Golrokh Moattar
|
84483ce9fc
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarOppositionPanel.html
view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarOppositionPanel.java
|
2014-03-06 09:17:08 +01:00 |
|
|
|
41d304eae4
|
Merge branch 'develop' into improvement/roles
|
2014-03-05 17:16:16 +01:00 |
|
|
|
c3635dad7c
|
Remove actual file data when deleting a FileDescription.
|
2014-03-05 17:15:51 +01:00 |
|
|
|
78fbb5fb35
|
Fixed merge problems.
|
2014-03-05 17:13:21 +01:00 |
|
|
|
127f160a23
|
Merge branch 'develop' into improvement/roles
Conflicts:
core/src/main/java/se/su/dsv/scipro/peer/PeerReview.java
core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java
core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java
|
2014-03-05 17:10:11 +01:00 |
|
|
|
99b69db64b
|
Core updated to no longer work with role entities.
|
2014-03-05 17:04:15 +01:00 |
|
|
|
2bdf262847
|
Fixed faulty foreign key reference.
|
2014-03-05 16:37:19 +01:00 |
|
Emil Siverhall
|
2a926a3807
|
count authors with more than one project participation on authors -> statistics
|
2014-03-05 16:11:33 +01:00 |
|
Emil Siverhall
|
cc112865d3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 12:05:27 +01:00 |
|
Emil Siverhall
|
d8fe67bd56
|
reverted some unfinished peer stuff, peer sprint next week
|
2014-03-05 11:58:10 +01:00 |
|
leosu
|
9a7825dcda
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 11:17:49 +01:00 |
|
leosu
|
0652bbb864
|
cleanup
|
2014-03-05 11:16:53 +01:00 |
|
Emil Siverhall
|
a531598dca
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 09:43:16 +01:00 |
|
leosu
|
db7c8eff74
|
attachment icon
|
2014-03-05 09:20:27 +01:00 |
|
|
|
d39dc34ea0
|
Migrated user roles to enum.
|
2014-03-04 17:49:01 +01:00 |
|
|
|
f63d670af0
|
Removed EXTERNAL role.
|
2014-03-04 17:17:47 +01:00 |
|
|
|
b8800949eb
|
Migrating helper functions away from Employee.
|
2014-03-04 17:04:01 +01:00 |
|
|
|
915842d0d5
|
Moved Employee attributes to User.
|
2014-03-04 16:44:09 +01:00 |
|
Emil Siverhall
|
30be0a7612
|
peer summary panel that lists all completed requests/reviews
|
2014-03-04 16:10:28 +01:00 |
|
|
|
e30b57d72d
|
Moved Student attributes to User.
|
2014-03-04 16:08:46 +01:00 |
|
Golrokh Moattar
|
abe4ad732b
|
Delete opponentReport and OppositionReport is possible by Admin Role
|
2014-03-04 16:05:42 +01:00 |
|
Emil Siverhall
|
6669ef2269
|
@Data PeerReview
|
2014-03-04 15:48:35 +01:00 |
|
|
|
7fdcd9dfee
|
Moved peer-related events to the peer package.
|
2014-03-04 15:35:35 +01:00 |
|
Emil Siverhall
|
8f6a21a645
|
count peerreviews with status parameter instead of separate methods for each status
|
2014-03-04 15:28:18 +01:00 |
|
|
|
53568adf03
|
Switched to GenericDataPanel2 with a FilteredProvider.
|
2014-03-04 15:18:37 +01:00 |
|
|
|
f1f5e65aa0
|
Made ChecklistTemplateService implement FilteredService
|
2014-03-04 15:02:35 +01:00 |
|
|
|
2d5da2a70e
|
Renamed method.
|
2014-03-04 15:01:04 +01:00 |
|
|
|
b59f2d8e53
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 14:52:12 +01:00 |
|
|
|
463a91dd84
|
Removed dependency on ApplicationPeriodExemption from Student.
|
2014-03-04 14:52:05 +01:00 |
|
leosu
|
0810743592
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 13:44:41 +01:00 |
|
leosu
|
37b11f047d
|
does now overwrite feedback and points
|
2014-03-04 13:44:37 +01:00 |
|
|
|
6dc33d1990
|
Removed dependency on Target from Employee.
|
2014-03-04 13:27:21 +01:00 |
|
leosu
|
671668094d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 13:05:54 +01:00 |
|
leosu
|
04a04ad37f
|
copy opposition feedback to grading report
|
2014-03-04 13:05:46 +01:00 |
|
Emil Siverhall
|
a0bdacf590
|
some doesPeriodOverlap tests
|
2014-03-04 11:18:13 +01:00 |
|
Emil Siverhall
|
43698b917b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 09:48:22 +01:00 |
|
