17275 Commits

Author SHA1 Message Date
e03ccbf3b8 Merge remote-tracking branch 'origin/develop' into develop 2015-06-10 17:32:23 +02:00
0b0d2ed827 [SCIPRO-42458] NullPointerException 2015-06-10 17:31:56 +02:00
ca10b5e2b3 [SCIPRO-43744] "Fixed" problem with uploading too large files except Wicket simple kills the connection when the user does. 2015-06-10 17:08:32 +02:00
golrokh
25ee8b86cb Merge remote-tracking branch 'origin/develop' into develop 2015-06-10 15:55:16 +02:00
golrokh
8b9c765aab Fixed tech review points 2015-06-10 15:55:09 +02:00
2a465176d3 Introduced lombok.@SneakyThrows instead of re-wrapping exceptions in a RuntimeException. 2015-06-10 13:20:34 +02:00
390a4cce47 Sonar fixes. 2015-06-10 13:09:40 +02:00
31ecdc6c5f Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java
2015-06-10 12:28:53 +02:00
golrokh
b1d131f95f Used project methods for checking if a user is supervisor, co-supervisor or author of the current project 2015-06-10 12:27:12 +02:00
047a101a95 [2972] Show active and completed final seminars on Author/ All Final Seminars 2015-06-10 12:19:50 +02:00
43f03f8247 [2953] Do not automatically sever the connection between SciPro and Daisy projects. 2015-06-10 10:48:02 +02:00
golrokh
b372b7b0d4 Finished with having confirmation on project creation if there is any active project for the authors 2015-06-10 10:39:38 +02:00
golrokh
ee6f9f0362 Merge branch 'develop' into ConfirmationOnProjectCreation 2015-06-10 10:13:28 +02:00
golrokh
b0a5001328 Fixed destination page based on role on notification page 2015-06-10 09:49:53 +02:00
93f58155a6 Fixed goli's push 2015-06-09 22:51:53 +02:00
golrokh
47252e2fe5 Fixed destination page based on role on notification page release-96 2015-06-09 16:09:57 +02:00
golrokh
77bb915e1c Finished I guess 2015-06-09 15:41:48 +02:00
nikos
d021f5418e Merge remote-tracking branch 'origin/develop' into develop 2015-06-08 17:37:09 +02:00
nikos
7635283df2 [2958] Default 6 månader i filter för unfinished final seminars. 2015-06-08 17:35:58 +02:00
golrokh
2575555e72 work in progress 2015-06-08 17:31:17 +02:00
eeab5b5a71 Handle null dates when exporting tables to Excel. 2015-06-08 16:05:29 +02:00
f1cd0ddff4 [SCIPRO-37665] Fixed problem when exporting all final thesis table to Excel. 2015-06-08 15:31:09 +02:00
b043994899 Optimized imports. 2015-06-08 09:17:53 +02:00
a7754c81aa Fixed test. 2015-06-08 09:13:37 +02:00
7baf1e790c Random Sonar fixes. 2015-06-05 16:44:58 +02:00
golrokh
65ad6247d3 work in progress 2015-06-05 14:15:20 +02:00
golrokh
072807c2b0 Merge remote-tracking branch 'origin/develop' into develop 2015-06-05 14:00:22 +02:00
041baf23e8 [2951] 2015-06-05 15:56:18 +02:00
be00d111fa [2956] Reviewer approval deadlines are no longer dynamically calculated but stored on the request when it is made so changing the settings will not mess with the statistics over who was late. 2015-06-05 15:37:53 +02:00
nikos
a52ad455ef [2816] Skicka kopia till handledaren när påminnelse går till granskare som är försenad 2015-06-05 14:51:12 +02:00
nikos
b5642adb20 Merge remote-tracking branch 'origin/develop' into develop 2015-06-05 12:05:56 +02:00
nikos
33d213d215 [2965] Möjligt att sortera på Requested och Title i Reviewers tre olika paneler. 2015-06-05 12:04:40 +02:00
golrokh
f627676dcd Merge remote-tracking branch 'origin/develop' into develop 2015-06-05 11:27:31 +02:00
golrokh
73d8792d07 Added project link to notification page 2015-06-05 10:35:43 +02:00
golrokh
6812c2dd79 Merge branch 'LateReviewerDecisions' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/statistics/AdminReviewerDeadlinesPage.java
2015-06-05 08:05:43 +02:00
golrokh
cd4c112f24 Finished 2015-06-05 08:04:40 +02:00
golrokh
98e79079fd Trying to make tab-links like before 2015-06-04 16:10:09 +02:00
golrokh
bb4db82d19 Made Missed Reviewer approval even faster 2015-06-04 11:10:53 +02:00
golrokh
be394c7779 Minor change 2015-06-04 08:05:51 +02:00
golrokh
74a8da9b9e Minor change 2015-06-03 13:58:23 +02:00
golrokh
d50ea56ca3 Tech review fixed 2015-06-03 13:48:47 +02:00
golrokh
c3e49f243a Tech review fixed 2015-06-03 13:35:33 +02:00
golrokh
14ed7c1a58 Tech review fixed 2015-06-03 13:30:35 +02:00
golrokh
4f615bd387 latest first on reviewer page 2015-06-03 13:17:28 +02:00
golrokh
f6a5ef6277 work in progress 2015-06-03 13:06:02 +02:00
golrokh
3315627b4d roll back 2015-06-03 11:46:39 +02:00
2b503dd0ad [2951] Included inactive and deleted projects in the supervisors view of all seminars. 2015-06-03 11:25:56 +02:00
golrokh
dc966a08a7 Fixed problem with updating palette 2015-06-03 10:33:02 +02:00
golrokh
a48814b209 Changed sort to asc on reviewer approvals based on requested date 2015-06-02 15:57:39 +02:00
golrokh
32012857ae Added unit to the late final seminar approvals 2015-06-02 15:45:19 +02:00