|
|
865040bb1d
|
Fixed warnings.
|
2014-03-26 11:13:12 +01:00 |
|
|
|
337b9f8ece
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-26 11:08:16 +01:00 |
|
|
|
8cb0a9de13
|
Removed FinalSeminarActiveParticipationRepo.
|
2014-03-26 11:07:53 +01:00 |
|
Golrokh Moattar
|
e437ea7d3f
|
Added FileSource Enum as a property to fileDescription
|
2014-03-26 11:05:49 +01:00 |
|
Golrokh Moattar
|
45c086571d
|
Added a fileSource Column to FileDescriptionTable
|
2014-03-26 11:03:00 +01:00 |
|
Emil Siverhall
|
14819f502c
|
ignore exceptions on peer review submission transactional annotation
|
2014-03-26 10:38:48 +01:00 |
|
|
|
693f0beee4
|
Remove isThesisFile from FileDescription.
|
2014-03-26 09:39:38 +01:00 |
|
fred-fri
|
fa55c0ed13
|
implemented method
|
2014-03-26 14:13:21 +09:00 |
|
Golrokh Moattar
|
a8ff2d2552
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 16:57:43 +01:00 |
|
Golrokh Moattar
|
cda2b0d0b7
|
On Admin milestone statistic, milestones can be filtered by projectTypes
|
2014-03-25 16:57:37 +01:00 |
|
Emil Siverhall
|
e92e9db0d5
|
cleanup
|
2014-03-25 15:53:57 +01:00 |
|
Emil Siverhall
|
0ea13e982b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 15:38:50 +01:00 |
|
Emil Siverhall
|
f25c1c8670
|
some de-ajaxification on comment thread panel
|
2014-03-25 15:08:50 +01:00 |
|
|
|
72f5502c9d
|
Fixed test.
|
2014-03-25 14:45:24 +01:00 |
|
|
|
0808fe3540
|
Removed stupid boolean that basically told the submit method not to submit.
|
2014-03-25 14:33:40 +01:00 |
|
|
|
c95a75e89d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 11:39:19 +01:00 |
|
|
|
c73a5fdb32
|
Editing checklist template questions is now done using event-based javascript. Nobody will ever be able to maintain it :)
|
2014-03-25 11:39:14 +01:00 |
|
Emil Siverhall
|
7bcee1b269
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 10:37:41 +01:00 |
|
Golrokh Moattar
|
0be50800f3
|
Added ProjectType filter to Peer Requests Statistic
|
2014-03-25 10:36:22 +01:00 |
|
Emil Siverhall
|
7e788e05b9
|
check co-supervisor and reviewers as well
|
2014-03-25 10:33:28 +01:00 |
|
Emil Siverhall
|
0242aed828
|
only get project types where logged in user is supervisor
|
2014-03-25 10:07:52 +01:00 |
|
fred-fri
|
92c6ed4e45
|
line
|
2014-03-25 16:07:15 +09:00 |
|
fred-fri
|
cc2d204374
|
order by
|
2014-03-25 12:35:34 +09:00 |
|
Emil Siverhall
|
a6e6edbf5c
|
unused methods/services
|
2014-03-24 16:42:20 +01:00 |
|
Golrokh Moattar
|
8bda47bc5b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-24 15:31:29 +01:00 |
|
Emil Siverhall
|
2ca6e445f8
|
add/remove methods for active participations
|
2014-03-24 15:27:30 +01:00 |
|
Golrokh Moattar
|
cc7fda1d05
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-24 15:26:52 +01:00 |
|
Emil Siverhall
|
add78e51db
|
@transactional save in final seminar service
|
2014-03-24 15:07:25 +01:00 |
|
Golrokh Moattar
|
d2d91b321e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-24 15:01:23 +01:00 |
|
Golrokh Moattar
|
4fa412c4bc
|
Added ProjectType to Admin>Peers filtering
|
2014-03-24 15:01:05 +01:00 |
|
Emil Siverhall
|
51c2313399
|
removed peer priority from settings
|
2014-03-24 14:53:01 +01:00 |
|
Emil Siverhall
|
cc16af1ffa
|
missing module binding that prevented seminar thesis file uploads
|
2014-03-24 13:47:36 +01:00 |
|
fred-fri
|
05f9c7a9b7
|
final seminar pages fixes
|
2014-03-24 15:53:46 +09:00 |
|
fred-fri
|
21b72b0f4a
|
keys misc
|
2014-03-24 12:53:44 +09:00 |
|
fred-fri
|
3f6b4d4be1
|
forum thread key
|
2014-03-24 11:47:00 +09:00 |
|
fred-fri
|
4d222bb435
|
forum post key
|
2014-03-24 11:43:47 +09:00 |
|
fred-fri
|
8ffe6f1a70
|
finalseminar keys
|
2014-03-24 11:40:31 +09:00 |
|
fred-fri
|
339a1f8b84
|
checklisttemplate keys
|
2014-03-24 11:39:02 +09:00 |
|
fred-fri
|
80068a5b6d
|
checklist keys
|
2014-03-24 11:37:43 +09:00 |
|
fred-fri
|
623b89caf0
|
peerreviewkeys
|
2014-03-24 11:29:47 +09:00 |
|
|
|
c0755539ae
|
Added missing binding.
|
2014-03-21 16:07:01 +01:00 |
|
|
|
de24b25a3f
|
Removed class level @Transactional to get rid of the warnings.
|
2014-03-21 16:03:13 +01:00 |
|
Emil Siverhall
|
c4455d61f8
|
removed Peer tab from Supervisor project overview
|
2014-03-21 14:52:41 +01:00 |
|
|
|
cfdd685d23
|
Renamed method to match the rest of the world.
|
2014-03-21 12:38:30 +01:00 |
|
|
|
7963dd8956
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestSubmissionPanel.html
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestSubmissionPanel.java
view/src/main/java/se/su/dsv/scipro/peer/panels/PeerRequestSubmissionPanel.properties
|
2014-03-21 11:27:01 +01:00 |
|
|
|
c19ad4a947
|
Fixed bad predicate when looking for system settings.
|
2014-03-21 11:12:31 +01:00 |
|
Emil Siverhall
|
cc15f3856a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-21 10:38:52 +01:00 |
|
Emil Siverhall
|
ec9d955283
|
only find requests where reviewer is not part of project
|
2014-03-21 10:36:33 +01:00 |
|
Emil Siverhall
|
5a87d5e290
|
renamed service method
|
2014-03-21 10:16:40 +01:00 |
|
fred-fri
|
0e5e104cf3
|
adding new pageparameterskeyfile
|
2014-03-21 17:24:13 +09:00 |
|
