6556 Commits

Author SHA1 Message Date
2e0f207388 Add language to peer request part 2 2015-02-11 16:41:34 +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
f6742fb4aa Changed so the panel now uses the new service method for moving final seminars. 2015-02-11 16:09:29 +01:00
golrokh
d768015270 Fixed Sonar stuff 2015-02-11 15:07:34 +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
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
golrokh
50a13a93c3 using bootstrap class instead of my own class for the green color :P 2015-02-09 11:04:16 +01:00
golrokh
354c9f0a0c using class instead of style for the green color 2015-02-09 10:55:11 +01:00
golrokh
92123d7429 Merge remote-tracking branch 'origin/develop' into develop 2015-02-09 10:41:07 +01:00
golrokh
da7673de61 Fixed the requested date for reviewer final grading report 2015-02-09 10:40:29 +01:00
933f915f21 Changed "Final seminar created before" filter to a between filter in Admin / Statistics / FInal seminars. 2015-02-09 10:18:06 +01:00
49703389b4 Added "Completed" project status to the default filter in Admin / Statistics / Final seminars. 2015-02-09 09:55:15 +01:00
db6bb55445 Made the "current user" link in the main menu a drop down with alternatives to edit your profile and, if possible, log out.
The edit profile link and log out button have been removed from the profile dialog/panel.
2015-02-06 17:28:34 +01:00
7c57af5b27 Made the role button dropdown in the main menu into a normal dropdown so it doesn't stick out like a sore thumb. 2015-02-06 16:46:10 +01:00
ec388e347d Removed more HTML. 2015-02-06 16:24:11 +01:00
1c7e5ddbf5 Merge remote-tracking branch 'origin/develop' into develop 2015-02-06 12:44:20 +01:00
905ed612ef Removed more stupid HTML. 2015-02-06 12:44:13 +01:00
6905cadf03 Removed some newlines and spaces that could cause the user links to have an added space after and/or before. 2015-02-06 12:33:29 +01:00
97513ba94f Removed useless HTML. 2015-02-06 12:25:33 +01:00
golrokh
49d5691214 Merge remote-tracking branch 'origin/develop' into develop 2015-02-06 12:07:04 +01:00
golrokh
afcf2d21cd Download Idea as a txt file 2015-02-06 12:06:51 +01:00
cf28a9cdfc Changed color of project edit button and icon to green 2015-02-06 11:17:35 +01:00
ec2de6518e Add logout button for local users fixed 2015-02-06 11:04:00 +01:00
2a858c6447 Removed more useless code. 2015-02-06 11:02:14 +01:00
f5f78d5f9d Fixed test. 2015-02-06 11:01:35 +01:00
b0813a97b9 Removed some useless code. 2015-02-06 10:50:49 +01:00
64fc7351f5 Improved feedback when saving notes. 2015-02-06 10:44:25 +01:00
302c134b19 Add logout button for local users 2015-02-05 16:09:48 +01:00
golrokh
9d21068737 Merge remote-tracking branch 'origin/develop' into develop 2015-02-05 12:27:33 +01:00
golrokh
23c70e6a3b Requested column added to the reviewer panels 2015-02-05 12:27:23 +01:00
55a02d9c02 Sigh. 2015-02-05 11:03:24 +01:00
20ee5982b9 [SCIPRO-26519] Fixed problem opening student profile from supervisors project overview of active participants.
(Note to self: detach models correctly)
2015-02-05 10:19:00 +01:00