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 |
|
Emil Siverhall
|
46f651cb3d
|
removed old manage targets page and panel
|
2014-03-04 09:38:49 +01:00 |
|
fred-fri
|
8f6ca657e6
|
removing change that filtered thesis_upload_opponent
|
2014-03-04 17:24:27 +09:00 |
|
fred-fri
|
d20c5e503b
|
notification fix
|
2014-03-04 12:59:40 +09:00 |
|
fred-fri
|
0a6dd35a5e
|
removed package cycle
|
2014-03-04 11:27:29 +09:00 |
|
fred-fri
|
6ab97fe136
|
bug fixes
|
2014-03-04 11:01:04 +09:00 |
|
Emil Siverhall
|
7e0c12c3b5
|
display previous periods targets as well.
|
2014-03-03 15:43:57 +01:00 |
|
Emil Siverhall
|
c4eb7f745f
|
new edit targets page with first columns initiated
|
2014-03-03 15:14:15 +01:00 |
|
|
|
abaeabc061
|
Changed from CMC to individual with add/remove methods.
|
2014-03-03 12:19:27 +01:00 |
|
|
|
bc185fa283
|
Fixed application periods creation thing.
|
2014-03-03 12:02:40 +01:00 |
|
Emil Siverhall
|
a15142e358
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/match/panel/MatchPeriodEditPanel.java
view/src/test/java/se/su/dsv/scipro/SciProTest.java
|
2014-03-03 08:47:45 +01:00 |
|
Emil Siverhall
|
0a18c2cda9
|
deleted old match period edit panel and moved doesPeriodOverlap to application period service
|
2014-03-03 08:37:11 +01:00 |
|
|
|
d5db5f580a
|
StudyPlan uses a Comparator for the set instead of AnnualReview implementing Comparable. With the internal set ordered the sort method is not needed.
|
2014-03-02 00:48:38 +01:00 |
|
|
|
82f0586f88
|
Make IdeaService implement FilteredService
|
2014-03-01 11:35:53 +01:00 |
|
|
|
3c3e3a9033
|
Renamed countAll to count
|
2014-03-01 09:22:40 +01:00 |
|
|
|
d916727653
|
Created a generic filtered data provider.
|
2014-03-01 08:54:03 +01:00 |
|
|
|
2e87b53fe6
|
Diamond operator.
|
2014-03-01 08:03:07 +01:00 |
|
|
|
a649666063
|
Removed commented out code.
|
2014-03-01 07:58:54 +01:00 |
|
|
|
92b53cfe8c
|
Fixed magic number.
|
2014-03-01 07:45:54 +01:00 |
|
|
|
a51e985ca0
|
Suppressed warnings due to Lombok.
|
2014-03-01 07:41:58 +01:00 |
|
|
|
fca8ac7937
|
Moved GradingReportExportRepo to the daisy integration package.
|
2014-02-28 22:47:33 +01:00 |
|
|
|
26c89cd353
|
Fixed mapping of ApplicationPeriodProjectType.
|
2014-02-28 22:28:31 +01:00 |
|
|
|
f0da49a17f
|
Fixed some sonar issues.
|
2014-02-28 17:19:48 +01:00 |
|
