6434 Commits

Author SHA1 Message Date
99a6ab0125 Removed non-working/unused code. 2015-11-19 13:09:17 +01:00
8afc3da2e4 Added a "left" column to Statistics / Unmet targets table to show how many ideas a supervisor has left to add before reaching their target. 2015-11-19 12:17:15 +01:00
e0d75477da [SCIPRO-168215] Fixed problem changing idea authors for admins. 2015-11-16 12:36:54 +01:00
941366033c [431] Fixed problem that made it impossible for students to select partner when taking a supervisor master idea. 2015-11-12 12:49:30 +01:00
6234d03f56 [421] Fixed problem with keywords not showing on ideas where research area had been selected earlier. 2015-11-02 11:52:34 +01:00
e10b7da5b0 [382] Removed orange trim on "current" menu item. 2015-10-28 14:13:40 +01:00
8b75f0a541 Fixed bug that caused users changing their notification settings to change the global setting instead. 2015-10-21 15:01:32 +02:00
203408e366 [381] Made project partner split by type. 2015-10-14 10:47:33 +02:00
nikos
ead7de3f4b Merge remote-tracking branch 'origin/develop' into develop 2015-09-08 15:46:27 +02:00
nikos
b732d3fcc7 Ändrade defaultDS till sciproDS. Behöver fixas i respektive context.xml i samband med deploy 2015-09-08 15:46:14 +02:00
f488948442 Fixed critical issue. 2015-09-04 10:21:14 +02:00
4285870d03 Some plugin version updates. 2015-08-03 14:53:03 +02:00
nikos
fed0dee3df Ändrade smtp server och fixade avsändare och mottagare för mail till jira 2015-06-17 14:23:40 +02:00
8b1280d7f8 Fixed so that the final thesis is shown even after the grading report is finalized. 2015-06-16 13:26:43 +02:00
887cc6b175 [SCIPRO-45724] Fixed problem when adding co-supervisors. 2015-06-16 11:22:23 +02:00
4aa907d73b [42458] NullPointerException 2 2015-06-11 13:49:25 +02:00
8f15519e00 Merge remote-tracking branch 'origin/develop' into develop 2015-06-11 13:15:32 +02:00
71577841ad [SCIPRO-42458] NullPointerException fix test 2015-06-11 13:15:20 +02:00
a1cda280ff [SCIPRO-35904] Fixed problem when setting profile picture to a uploaded file without selecting a file. 2015-06-11 10:26:31 +02:00
881b3fac8d Sonar fixes. 2015-06-11 10:05:05 +02:00
7be0c305a2 Sonar fixes. 2015-06-11 09:57:59 +02:00
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
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 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
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
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