6122 Commits

Author SHA1 Message Date
903cea0fdb Merge remote-tracking branch 'origin/develop' into develop 2014-01-23 14:05:15 +01:00
dd1dbeaba6 Added a drop down where you can select how milestones gets activated.
Made it impossible to create events in java code to better communicate that you are not supposed to.
Lombok'd MileStoneActivity.
2014-01-23 14:05:10 +01:00
Leo
7c9328713d Merge remote-tracking branch 'origin/develop' into develop 2014-01-23 13:42:42 +01:00
Leo
870e554324 changed from user to student in FinalSeminarRespondent 2014-01-23 13:42:20 +01:00
eee7355adc Renamed variable to reflect what it actually is. (Old phase is required to calculate sort order if moving between phases) 2014-01-23 13:39:07 +01:00
Leo
0fd60b069a working radio buttons for FinalSeminarRespondent 2014-01-23 13:33:07 +01:00
Richard
49e9b7a666 Removed h2 from final seminar title. Added h3 instead. 2014-01-23 13:27:30 +01:00
Leo
3f492fc592 new entity FinalSeminarRespondent with services and repo. 2014-01-23 11:36:41 +01:00
94f63f3187 Merge remote-tracking branch 'origin/develop' into develop 2014-01-23 09:56:41 +01:00
0d25e87655 Fixed logging (no more stack overflows and only includes relevant information in Idea#toString). 2014-01-23 09:56:31 +01:00
fred-fri
912bf75bba Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-01-23 16:43:00 +09:00
Emil Siverhall
76faa50bc9 Merge remote-tracking branch 'origin/develop' into develop 2014-01-23 08:16:31 +01:00
Emil Siverhall
1e0691a309 refactoring to make first meeting submission work properly 2014-01-23 08:16:15 +01:00
fred-fri
674cf84b1d test fix and cleanup 2014-01-23 14:59:17 +09:00
fred-fri
93ea2d380e cleanup 2014-01-23 14:46:50 +09:00
fred-fri
7484bdf650 made the final grading report copy of the preliminary grading reports user centric, e.g. differ between supervisor and reviewer ones 2014-01-23 14:09:23 +09:00
fred-fri
053b55ddd4 pressing submit on preliminary grading report now saves answers in final grading report too, but when reviewer does a preliminary grading report the final grading report answers get overwritten, e.g. the copy isnt user specific 2014-01-23 12:32:47 +09:00
Emil Siverhall
7495fcaaf0 daily issues.. 2014-01-22 22:13:56 +01:00
Leo
bfd2b241bb Merge remote-tracking branch 'origin/develop' into develop 2014-01-22 17:02:06 +01:00
Leo
61cd2029ed added BETA view 2014-01-22 17:01:45 +01:00
Leo
407a01356e added radiobuttons 2014-01-22 16:54:06 +01:00
Richard
10e0e993a5 Removed css-classes that wasn't being used. 2014-01-22 16:05:06 +01:00
Richard
99ea0acb73 Merge remote-tracking branch 'origin/develop' into develop 2014-01-22 15:37:01 +01:00
Richard
46d4b9b020 Minor changes in the css-file.
Removed a commented line that wasn't needed.
2014-01-22 15:36:53 +01:00
Leo
72c9689fed Merge remote-tracking branch 'origin/develop' into develop 2014-01-22 15:01:00 +01:00
Leo
9455224ab1 styling and BETA-hiding 2014-01-22 14:59:28 +01:00
343352719e Added logging to try and figure out why it is not attempting to export ideas every day if the previous export failed. 2014-01-22 14:57:35 +01:00
Leo
87d319eeef added new list to ViewThesisCommentsPanel 2014-01-22 14:54:35 +01:00
Emil Siverhall
80660a55e4 Merge remote-tracking branch 'origin/develop' into develop 2014-01-22 14:15:52 +01:00
Emil Siverhall
5ba69e5882 avoid duplicated answers when submitting peer reviews 2014-01-22 14:15:38 +01:00
Leo
45a968f628 added download link for opposition report 2014-01-22 13:36:45 +01:00
Leo
ae41a4122d refactored out DownloadPdfPanel 2014-01-22 11:37:13 +01:00
Leo
e9a0f289f0 refactored GradingReportPdfResource 2014-01-22 10:27:48 +01:00
Leo
d225f5e148 *refactored PreliminaryGradingReportPdfResource into abstract hierarchy
*added template for opposition report
*prepared OppositionReport for template with getters
2014-01-22 10:10:46 +01:00
Leo
1d90c9afcc hides create report link if submitted 2014-01-22 09:44:27 +01:00
Emil Siverhall
62685f0aa3 hi 2014-01-21 23:05:29 +01:00
Emil Siverhall
3cba8fb096 tests 2014-01-21 22:58:43 +01:00
Emil Siverhall
acac4a963b removed supervisor peer list panel since it's basically the same as the old admin peer list panel. now called peer list panel. 2014-01-21 22:53:12 +01:00
Emil Siverhall
1ea236f112 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 22:13:17 +01:00
a47a309838 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 16:47:57 +01:00
a6cc487aac Refactored ActivityPlanPanel to reduce anonymous class size and general improvements. 2014-01-21 16:47:51 +01:00
Leo
0b7306a234 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 16:26:46 +01:00
Leo
14302f4682 added download link för preliminary pdf 2014-01-21 16:26:34 +01:00
Emil Siverhall
4e5a1fe9b2 proper sized dialogs when previeweing peer review templates 2014-01-21 16:16:03 +01:00
Emil Siverhall
93cd002a78 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 16:07:43 +01:00
Emil Siverhall
c6f7fafdc6 menu highlighting and back button from select student ideas 2014-01-21 16:07:31 +01:00
Richard
d22dc00f70 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 16:03:35 +01:00
Richard
432d65886c Improved styling when performing a peer review. 2014-01-21 15:59:24 +01:00
Emil Siverhall
7625db7d4a Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 15:30:49 +01:00
Emil Siverhall
68843e8517 ... 2014-01-21 15:30:29 +01:00