16941 Commits

Author SHA1 Message Date
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
golrokh
bd56f74cba Fixed missing milestone auto completion for RoughDraftApprovalApproved (Auto) release-93 2015-05-19 12:01:54 +02:00
golrokh
c0a706e602 Merge remote-tracking branch 'origin/develop' into develop 2015-05-19 10:09:21 +02:00
fd0295b1dc [SCIPRO-34309] Reduced log level when the Daisy API is down while trying to fetch authors grades for milestone completion. 2015-05-19 12:02:31 +02:00
be3ab38e3e [SCIPRO-34287] Handle the case when Daisy API is not available when searching for users in the auto-complete. 2015-05-19 11:56:03 +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
505c49dfd1 #2894 Apparently there were two identical texts in completely different contexts. release-92 2015-05-11 14:09:23 +02:00
835b6a0c3d Revert "#2894 Changed some texts."
This reverts commit e2e0e6976f14babec8993e5d3aa3356102bc2930.
2015-05-11 14:07:47 +02:00
6c2b4f2e0c #2864 Changed to timeline panel in the supervisors interaction with reviewers. 2015-05-11 10:44:59 +02:00
e2e0e6976f #2894 Changed some texts. 2015-05-11 10:32:37 +02:00
nikos
e2ced4febc [2887] Liten textändring 2015-05-08 16:42:02 +02:00
447745ca2d [SCIPRO-34221] Made title and status required when editing a project as a supervisor. 2015-05-07 14:23:14 +02:00
d15e5d4a09 Minor change. 2015-05-07 14:15:58 +02:00
aecaeeba3b [SCIPRO-34139] If the Daisy project is missing when trying to mark the grading completed milestone completed by checking the students grade we sever the connection to the no longer existing project. 2015-05-07 14:15:12 +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
Andreas Svanberg
9bc23b886a Fixed some potential NPEs. release-91 2015-04-29 19:56:32 +02:00
nikos
be87ee977b Improved text formulations 2015-04-29 13:52:50 +02:00
nikos
64fd3e04e1 Cosmetic changes 2015-04-29 13:47:56 +02:00