17211 Commits

Author SHA1 Message Date
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. release-94 2015-05-28 18:03:29 +02:00
63a0f10b46 Updated Lombok in an attempt to fix compilation under Java 8. 2015-05-28 17:19:26 +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
35de08b6ca [2871] Minor text change. 2015-05-28 16:35:42 +02:00
be697f96d5 [2872] Minor text change. 2015-05-28 16:33:58 +02:00
d67da8847f [2914] Minor text change. 2015-05-28 16:32:26 +02:00
c63114f2b8 [2885] Changed default filter for Admin / Final seminars to only include a start date.
Fixed so that BootstrapDateField supports "nulling" the date instead of always defaulting to now when cleared.
2015-05-28 16:31: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
3788bc6201 [2886] Improved filter for final seminar exemptions. 2015-05-28 15:39:48 +02:00
2172d78ff5 [2890] Project opposition page now show the reason why opposition is not possible. 2015-05-28 15:27:18 +02:00
golrokh
fd827fa641 Fixed test 2015-05-28 15:14:41 +02:00
golrokh
542cf34aa3 Merge remote-tracking branch 'origin/develop' into develop 2015-05-28 13:47:03 +02:00
golrokh
90e88f207f Fixed ordering and names of columns in reviewer deadlines statistic 2015-05-28 13:46:58 +02:00
01c9f0817f Merge remote-tracking branch 'origin/develop' into develop 2015-05-28 13:40:17 +02:00
60a2d75db8 [2934] Made button green. 2015-05-28 13:40:08 +02:00
golrokh
6693fd113b Merge remote-tracking branch 'origin/develop' into develop 2015-05-28 13:38:28 +02:00
golrokh
8bb398decf Fixed wrong workdays late in reviewer deadlines 2015-05-28 13:38:22 +02:00
12d9d06fcb Pagination on the client side does not speed anything up. 2015-05-28 13:25:41 +02:00
5bca6d955e Added unit column to reviewer deadlines. 2015-05-28 13:20:00 +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
c89a1ba931 Fixed wrong workdays late in reviewer deadlines 2015-05-28 11:06:13 +02:00
golrokh
d5dbd4a44c Sonar. Activity/Comparable 2015-05-28 10:18:24 +02:00
golrokh
0c82062da7 Merge remote-tracking branch 'origin/develop' into develop 2015-05-27 17:09:11 +02:00
golrokh
7348fca678 Fixed viewing "workdays late" in admin>statistics>reviewer deadlines 2015-05-27 17:09:01 +02:00
golrokh
d02542b0ba Fixed viewing "workdays late" in admin>statistics>reviewer deadlines 2015-05-27 17:08:42 +02:00
2bd57201bf Fixed so the grading report stays open if the form submission failed. 2015-05-27 16:29:42 +02:00
3c55e2e6ab Merge remote-tracking branch 'origin/develop' into develop 2015-05-27 16:21:06 +02:00
7f5de03543 Reduced auto-saving interval down to 10s. 2015-05-27 16:20:55 +02:00
ccd73e0801 Fixed problem with input fields getting cleared when submission of a grading report fails.
Fixed auto-saving when filling in grading reports.
2015-05-27 16:19:42 +02:00
golrokh
2859f14a56 Fixed showing inactive projects in the lists 2015-05-27 16:05:51 +02:00
golrokh
07b2e828fc Merge remote-tracking branch 'origin/develop' into develop 2015-05-27 15:20:07 +02:00
golrokh
327c5b6fa9 Fixed bad set 2015-05-27 15:20:02 +02:00
0d5e94b46c [SCIPRO-35886] Fixed error when adding more than one opponent at the same time to a final seminar. 2015-05-27 14:32:37 +02:00
3543f5a24d Have to be explicit about which component the messages come from since they never get assigned to the link. 2015-05-27 14:22:08 +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
1e7b1f0518 Fixed problem with calling getString in constructor. 2015-05-27 13:57:35 +02:00
golrokh
ae7d2f4c8f Sonar. 2015-05-27 13:31:49 +02:00
golrokh
d8409f1f49 Sonar. 2015-05-27 12:51:51 +02:00
434ecf4e93 Fixed test. 2015-05-27 12:02:05 +02:00
14cebaa867 [SCIPRO-35885] Fixed problem when going to the page with parameters that did not correspond to an existing final seminar. 2015-05-27 10:56:19 +02:00
golrokh
68425225ed Sonnar. 2015-05-22 10:00:27 +02:00