3980 Commits

Author SHA1 Message Date
047a101a95 [2972] Show active and completed final seminars on Author/ All Final Seminars 2015-06-10 12:19:50 +02:00
golrokh
ee6f9f0362 Merge branch 'develop' into ConfirmationOnProjectCreation 2015-06-10 10:13:28 +02:00
golrokh
77bb915e1c Finished I guess 2015-06-09 15:41:48 +02:00
b043994899 Optimized imports. 2015-06-08 09:17:53 +02:00
7baf1e790c Random Sonar fixes. 2015-06-05 16:44:58 +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
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
bb4db82d19 Made Missed Reviewer approval even faster 2015-06-04 11:10:53 +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
f6a5ef6277 work in progress 2015-06-03 13:06:02 +02:00
golrokh
3315627b4d roll back 2015-06-03 11:46:39 +02:00
golrokh
a48814b209 Changed sort to asc on reviewer approvals based on requested date 2015-06-02 15:57:39 +02:00
golrokh
726bb17c7c Fixed late workingdays on reviewer deadlines 2015-06-01 17:40:39 +02:00
golrokh
acff0dda83 Fixed test and Fixed arrays.aslist for arrays with only single value 2015-06-01 15:47:55 +02:00
golrokh
35360f8a7d Fixed tests 2015-06-01 15:27:59 +02:00
golrokh
a68358e651 Fixed tests 2015-06-01 14:14:58 +02:00
golrokh
96412ebd54 Sonar. 2015-06-01 13:57:16 +02:00
golrokh
c405729702 Made CustomComparator classes Serializable because of Wicket 2015-06-01 11:02:14 +02:00
golrokh
b703c23be3 Minor change 2015-06-01 10:53:09 +02:00
golrokh
e120627af8 Sonar 2015-06-01 10:51:37 +02:00
golrokh
2933530d3d Fixed depricated Delegate 2015-06-01 09:55:37 +02:00
golrokh
aa446fa0aa Sonar. 2015-06-01 09:55:06 +02:00
f4020516f0 Added dependency to jersey-media-jaxb to get back XML support. 2015-05-29 17:42:46 +02:00
golrokh
9725d9abb3 Fixed so that the workers can be sorted by their descriptions 2015-05-29 15:47:03 +02:00
golrokh
a008d6d27a Fixed so that "annual review" reminder only can be sent for project-types that have "Study plan" module 2015-05-29 15:16:28 +02:00
golrokh
299b3c79be Made Reviewer deadline a bit faster, but it is still slow! 2015-05-29 14:41:09 +02:00
golrokh
6931995064 Merge remote-tracking branch 'origin/develop' into develop 2015-05-29 10:59:25 +02:00
golrokh
fdba1c15b7 Added date filtering for Reviewer deadlines 2015-05-29 10:59:21 +02:00
852e2d9235 Removed explicit execution of Lombok. 2015-05-28 18:03:29 +02:00
ea5614bd94 [2909] Authors can now submit/partner up on a second idea within an application period if their first idea is made inactive by an admin. 2015-05-28 16:52:43 +02:00
golrokh
4db807ebab Merge remote-tracking branch 'origin/develop' into develop 2015-05-28 15:57:14 +02:00
golrokh
d824f8aeec Sonar 2015-05-28 15:57:09 +02:00
2172d78ff5 [2890] Project opposition page now show the reason why opposition is not possible. 2015-05-28 15:27:18 +02:00
1ab9ee8b09 Upgraded versions.
Could not update Hibernate due to problems with enums.
Could not update Commons CSV due to stupid reliance on CSVRecord#toString.
2015-05-28 13:05:25 +02:00
ecf211f23b Uh? 2015-05-28 11:38:46 +02:00
c16042f06b [2915] Fixed so the checklist overview only takes into account checklists that are attached to the current activity plan.
There are still many orphan checklists in the database and Hibernate can not orphanRemoval them.
2015-05-28 11:10:35 +02:00
golrokh
d5dbd4a44c Sonar. Activity/Comparable 2015-05-28 10:18:24 +02:00
golrokh
327c5b6fa9 Fixed bad set 2015-05-27 15:20:02 +02:00
golrokh
a9427d04a0 Sonar undo - weird errors happened so I reverted! The changes are in the branch makeUserUncomparable 2015-05-27 14:07:22 +02:00
golrokh
ae7d2f4c8f Sonar. 2015-05-27 13:31:49 +02:00
golrokh
d8409f1f49 Sonar. 2015-05-27 12:51:51 +02:00
golrokh
bd56f74cba Fixed missing milestone auto completion for RoughDraftApprovalApproved (Auto) 2015-05-19 12:01:54 +02:00
golrokh
61bd55df46 Sonar 2015-05-19 10:09:16 +02:00
golrokh
a564ba4a9e Sonar 2015-05-18 18:36:26 +02:00
golrokh
caeda2dc11 Used @InjectMocks instead of doing it manually 2015-05-18 13:30:19 +02:00
golrokh
cd1fcd1ca3 Sonar 2015-05-18 09:30:29 +02:00
golrokh
4494d48e22 Fixed the problem with not including projects with no reviewer approval in the admin/final seminar/statistic page 2015-05-07 13:11:43 +02:00