16435 Commits

Author SHA1 Message Date
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 release-74 2015-02-05 16:09:48 +01:00
badcf05bdc Updated git mailmap. 2015-02-05 15:56:03 +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
golrokh
6a82ba3a93 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/se/su/dsv/scipro/notifications/notifications.properties
2015-02-05 10:12:23 +01:00
295d815f80 [SCIPRO-26332] Fixed problem when trying to download a file with invalid id.
There was a reason PublicFileDescriptionService#findOne returned an Option and that was not so you could call #get on it.
2015-02-05 10:08:18 +01:00
142ea100cb Notification that a first meeting has not been booked at course start. 2015-02-04 16:14:59 +01:00
62a725aeb3 Fixed test. 2015-02-04 10:28:02 +01:00
73d3916461 Made the tabs for the supervisors grading reports in the reviewers grading report view super-explicit. 2015-02-04 10:07:40 +01:00
675724ddd9 Added stupid title explaining what the "Interact with supervisor" is. 2015-02-04 10:04:30 +01:00
779bf391da Cleaning. 2015-02-04 09:56:22 +01:00
7e95f9ce4e Fixed problem when trying to update a user without changing email (it is not unique but it belongs to the current user.) 2015-02-04 09:54:40 +01:00
e1cb343cd1 Minor clean up. 2015-02-04 09:51:07 +01:00
a09a707465 Fixed test. 2015-02-04 09:47:51 +01:00
bfaa242c9c Changed the contents and title of the first meeting mail. 2015-02-04 09:37:23 +01:00
22659c8736 Fixed version conflict with SQL migrations. 2015-02-04 09:33:54 +01:00
ee075edeeb Bleh stupid frameworks. 2015-02-04 09:32:13 +01:00
b053626014 Ugh Lombok. 2015-02-04 09:23:17 +01:00
9f23850618 Removed title truncation for reviewers. 2015-02-04 09:20:13 +01:00
18859b4010 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2015-02-03 17:45:22 +01:00
c50079af28 Worker to remind people about booking first meetings. 2 and 5 work days before the application period is set to start. 2015-02-03 17:38:34 +01:00
a419e010e1 Add supervisor comment to decision 2015-02-03 17:23:23 +01:00
golrokh
8552ab4e39 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/se/su/dsv/scipro/notifications/notifications.properties
2015-02-02 16:26:46 +01:00
golrokh
17885157ad Show idea modal when click on a idea-notification 2015-02-02 16:25:28 +01:00
61584ba3e4 Fixed so the "additional message" gets saved for idea-based notifications. 2015-02-02 15:46:38 +01:00
f0d114b485 Improved the contents of the first meeting notification. Now includes date, room and description. (Bit of a hack to fit in three values). 2015-02-02 15:33:53 +01:00
76fd29d43f Made the supervisor description for first meeting show as a multi line label to preserve the formatting and not be a stupid wall of text. 2015-02-02 14:44:47 +01:00
b2db9db928 Changed "EXPORT_SUCCESS" notification to be project based and link to the overview. 2015-02-02 14:13:12 +01:00
golrokh
5d3027cddb Automatic milestone: Rough draft approval requested 2015-02-02 12:39:27 +01:00
387d395db2 Added "Supervisor approves final thesis" as a possible event for activating milestones. 2015-02-02 12:24:51 +01:00