16248 Commits

Author SHA1 Message Date
d58282d1ab Removed faulty back link. 2014-10-20 09:43:38 +02:00
fred-fri
aa06b60d09 switching places release-2014-10-20_05-31-21 2014-10-20 11:16:36 +09:00
fc5e1dc344 Test fixes. release-2014-10-18_01-41-15 2014-10-17 16:56:04 +02:00
49289fba8e Swapped date and title to make it match Peer. 2014-10-17 16:53:49 +02:00
2023abe8c2 [SCIPRO-20284] Fixed bug when downloading opposition reports and preliminary grading reports. Yay reflection. 2014-10-17 16:48:32 +02:00
210bb297ee Removed problematic preliminary grading reports in the new process. 2014-10-17 16:38:03 +02:00
be5ebfd962 Updated the preliminary grading report link on the final seminar page to point the user to the correct new pages. 2014-10-17 16:33:21 +02:00
741816f1f3 Test fixes. 2014-10-17 16:32:27 +02:00
f2e4c37f73 It is now possible to submit a snapshot of either grading report as preliminary grading report to a final seminar. 2014-10-17 14:54:15 +02:00
da79fcf2dd Added condition for submitting preliminary grading report that the final seminar has a document attached. 2014-10-17 12:31:04 +02:00
97add3a354 Added unique constraint to prevent multiple preliminary grading reports from being created for the same final seminar/author combination. 2014-10-17 12:16:09 +02:00
ac00e6aa4b Merge remote-tracking branch 'origin/develop' into develop 2014-10-17 11:59:21 +02:00
fred-fri
15d89f60c6 made variables set instead of hashset 2014-10-17 18:14:07 +09:00
fred-fri
860eb284b6 Merge remote-tracking branch 'origin/develop' into develop 2014-10-17 18:08:17 +09:00
cc13917fdf Lombok for getters/setters. Maybe use a proper language that does not need boilerplate or libraries to spit out boilerplate. 2014-10-17 11:02:42 +02:00
fred-fri
2c6629fbb7 test 2014-10-17 18:00:09 +09:00
3b4e75dd50 Seriously 2014-10-17 10:58:02 +02:00
8d9e8c7cb1 Added more logic and test to make sure successful submissions are marked as submitted and saved to the database. 2014-10-17 10:57:36 +02:00
644e9db6b9 Merge remote-tracking branch 'origin/develop' into develop 2014-10-17 10:03:38 +02:00
89a7a87ad9 [SCIPRO-20301] Fixed rendering of student ideas for supervisor. 2014-10-17 10:03:29 +02:00
fred-fri
a57e0d35a6 cleanup 2014-10-17 16:52:38 +09:00
fred-fri
0d9db71deb rewritten opposition and participation gui 2014-10-17 16:27:29 +09:00
fred-fri
214620c2ad refactoring multiple attachments 2014-10-17 13:46:50 +09:00
fred-fri
f853793e56 Merge branch 'develop' into attachments 2014-10-17 12:41:38 +09:00
fred-fri
018cb5d6a3 improved display of checklist title and description 2014-10-17 12:31:28 +09:00
fred-fri
0f2379cb82 improved info 2014-10-17 11:34:38 +09:00
fred-fri
806d74afd7 final grading report > grading report in a single place 2014-10-17 11:16:54 +09:00
fred-fri
a74cbdc901 Revert "final grading report > grading report"
This reverts commit 4dee431b3ccf14f844b5be27b8a6bf5ad5ad6af0.
2014-10-17 11:13:10 +09:00
8d1ba39723 Change checklist text format to header fix test 2014-10-16 20:05:42 +02:00
1fb42a3948 Change checklist text format to header 2014-10-16 19:10:36 +02:00
golrokh
21f9de4a4f DB and classes changed 2014-10-16 17:49:45 +02:00
8204adabe6 Merge remote-tracking branch 'origin/develop' into develop 2014-10-16 16:44:11 +02:00
181a4d70d1 Business logic for submitting a grading report as a preliminary report. 2014-10-16 16:17:11 +02:00
eb27cb1771 Add description text to add exception panel 2014-10-16 16:13:30 +02:00
455ad130fa Local user table split name add e-mail 2014-10-16 16:09:54 +02:00
03ddbc622e Admins can now change users password. 2014-10-16 14:05:21 +02:00
9f9cf107de Removed bottom margin on buttons within modal footers. 2014-10-16 14:04:01 +02:00
d423d70274 Made comment for application period exemptions handle strings up to 65536 characters (TEXT MySQL type) instead of only 255 (VARCHAR(255)). 2014-10-16 12:47:06 +02:00
8c12482542 Fixed approval history to also show reason with MultiLineLabel 2014-10-16 11:02:41 +02:00
ad5561275b Bootstrapped the HTML and fixed IDE warnings due to wicket:for 2014-10-16 10:56:53 +02:00
fred-fri
94386a1544 refactoring multiple attachments 2014-10-16 17:55:59 +09:00
701030874f Simplified HTML. 2014-10-16 10:30:21 +02:00
b4bfb44662 Green button. 2014-10-16 10:25:36 +02:00
a802b1b3f9 Changed text. 2014-10-16 10:24:43 +02:00
golrokh
80e5e16bd8 Add point template to the DB 2014-10-16 10:17:56 +02:00
fd0914c036 Merge remote-tracking branch 'origin/develop' into develop 2014-10-16 10:04:02 +02:00
2431214ef7 Refactored so the boolean parameter is actually used. 2014-10-16 10:03:56 +02:00
142b91b99c Some more minor touches. 2014-10-16 09:47:39 +02:00
fred-fri
c7b66cba20 Merge branch 'develop' into attachments 2014-10-16 16:47:04 +09:00
fred-fri
2c97b2e2cd Merge remote-tracking branch 'origin/develop' into develop 2014-10-16 16:46:02 +09:00