16939 Commits

Author SHA1 Message Date
f13d7e1226 Clean up around creating/editing activities. 2015-02-12 11:27:36 +01:00
077451e823 Fixed authorization check. 2015-02-12 11:19:39 +01:00
038997eef0 Removed unnecessary authorization check since the exact same one is performed in the superclass. 2015-02-12 11:09:11 +01:00
decff829bb Removed unnecessary authorization check since the exact same one is performed in the superclass. 2015-02-12 11:06:30 +01:00
golrokh
27e9c02a2f Merge remote-tracking branch 'origin/develop' into develop 2015-02-12 10:41:19 +01:00
golrokh
c9e3b554a6 Fixed Sonar stuff 2015-02-12 10:41:10 +01:00
45e9432287 Text changes. 2015-02-12 10:14:38 +01:00
217a94967e Recreating objects for no reason is great... 2015-02-12 10:13:29 +01:00
golrokh
8e2bccd93d Fixed extra ; 2015-02-12 10:09:41 +01:00
golrokh
56fc6b0a44 Fixed test release-75 2015-02-11 17:00:20 +01:00
golrokh
f05ddcd685 Merge remote-tracking branch 'origin/develop' into develop 2015-02-11 16:58:22 +01:00
golrokh
96634301fe Fixed test 2015-02-11 16:58:16 +01:00
golrokh
fedc5c98e7 Merge remote-tracking branch 'origin/develop' into develop 2015-02-11 16:55:11 +01:00
golrokh
796882b8c0 Fixed Sonar stuff 2015-02-11 16:55:05 +01:00
6bd4a1113f Removed bad SQL UPDATE statements 2015-02-11 16:53:36 +01:00
1e3170eb0f Sonar. 2015-02-11 16:49:18 +01:00
2e0f207388 Add language to peer request part 2 2015-02-11 16:41:34 +01:00
99de93eb07 Sonar. 2015-02-11 16:43:28 +01:00
e27b63d19e Add language to peer request part 1 fex test 2015-02-11 16:16:49 +01:00
8a1647ffe1 Merge remote-tracking branch 'origin/develop' into develop 2015-02-11 16:20:54 +01:00
feffc7287f Made the final seminar activity's action "FINAL_SEMINAR". 2015-02-11 16:20:44 +01:00
fbd5c5bfc5 Tiny refactor. 2015-02-11 16:19:59 +01:00
5cce53fa3a Hooked up the final seminar activity handler to react to moved seminars and also move the activity. 2015-02-11 16:10:06 +01:00
f6742fb4aa Changed so the panel now uses the new service method for moving final seminars. 2015-02-11 16:09:29 +01:00
b53f1066ce Implemented service method to move a final seminar with proper validation logic. 2015-02-11 15:40:01 +01:00
334d630ed7 Tiny refactor. 2015-02-11 15:37:36 +01:00
94e805f5e9 De-Lombok'd some stuff. 2015-02-11 15:35:20 +01:00
golrokh
d768015270 Fixed Sonar stuff 2015-02-11 15:07:34 +01:00
golrokh
a7f1a96580 Fixed Sonar stuff 2015-02-11 15:02:20 +01:00
golrokh
5ecbe1c1bd Merge remote-tracking branch 'origin/develop' into develop 2015-02-11 14:51:01 +01:00
golrokh
c1d0a00cc5 Fixed Sonar stuff 2015-02-11 14:50:19 +01:00
golrokh
0fccf62f5f Fixed Sonar stuff 2015-02-11 14:47:34 +01:00
5d322e7907 Merge remote-tracking branch 'origin/develop' into develop 2015-02-11 14:45:57 +01:00
cbbfd3f3fa Add language to peer request part 1 2015-02-11 14:45:21 +01:00
golrokh
ab4574e775 Fixed test 2015-02-11 14:45:14 +01:00
golrokh
bc00f6291f "Created between" to "project created between" in admin, statistic, final seminars 2015-02-11 14:05:23 +01:00
golrokh
c4fa1e3c6b Changed color to green for edit in Group forum 2015-02-11 14:02:18 +01:00
golrokh
9b7ed4115c Implemented a better way for downloading ideas as a file, to prevent having temporally files on the server 2015-02-11 13:57:36 +01:00
golrokh
4b2abcba94 Merge remote-tracking branch 'origin/develop' into develop 2015-02-11 13:56:01 +01:00
golrokh
0d4a344f16 Implemented a better way for downloading ideas as a file, to prevent having temporally files on the server 2015-02-11 13:55:41 +01:00
e7ab7c9382 Changed the peer link for supervisors in the activity plan. 2015-02-11 13:10:25 +01:00
75e9b622e0 Formatting. 2015-02-11 13:04:51 +01:00
746cb6913d [SCIPRO-26535] Skip importing users from Daisy without a defined e-mail. 2015-02-11 12:57:34 +01:00
ad63a34bf1 [SCIPRO-26692] Clicking on failed export notification crashes due to lazy model on the idea 2015-02-10 16:18:38 +01:00
golrokh
27a1721b8e Made Forum notifications "read" when Reviewer go to the "Iteract with supervisor" forum via ReviewPage 2015-02-10 13:41:27 +01:00
11e90cd42f Active participant can delete themselves 2015-02-10 12:35:04 +01:00
c7de6d9bff Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2015-02-10 12:29:29 +01:00
golrokh
61847aa8de Fixed the problem with exporting idea when application period is null 2015-02-10 10:28:05 +01:00
28d34eaac5 Minor formatting 2015-02-10 10:10:27 +01:00
611dae548b [SCIPRO-26527] Fixed problem with first meeting reminder worker if there are no first meetings in the database. 2015-02-09 13:11:36 +01:00