6440 Commits

Author SHA1 Message Date
bfcbce70ca All these rows make me sick. 2014-10-22 08:46:42 +02:00
fred-fri
c5cb603f15 removed panel 2014-10-22 13:19:55 +09:00
fred-fri
943f4a8809 tests 2014-10-22 11:39:12 +09:00
fred-fri
198a5658e4 markup fixes 2014-10-22 10:59:33 +09:00
fred-fri
1f2c96a0fd small fixes 2014-10-22 10:13:12 +09:00
000d644271 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-10-21 17:20:12 +02:00
28535e7a94 Added feedback to save & add more users #2300 2 2014-10-21 17:20:01 +02:00
golrokh
5b73bdceee keep required to pass 2014-10-21 16:25:09 +02:00
27b107d061 Merge remote-tracking branch 'origin/develop' into develop 2014-10-21 15:24:50 +02:00
1973721b8e Changed "initial assessment" to "first version". 2014-10-21 15:24:44 +02:00
fred-fri
f4cbd08953 header 2014-10-21 16:34:17 +09:00
ba3447be52 Fixed duplicate HTML ids on the supervisor grading page that broke dialog toggling and finalize checkbox. 2014-10-21 08:33:49 +02:00
fred-fri
f05dadd7b9 standards 2014-10-21 14:25:28 +09:00
fred-fri
88bc17c08e https on gravatar 2014-10-21 12:50:07 +09:00
fred-fri
e5e9f52f5e space 2014-10-21 12:05:54 +09:00
fred-fri
d7dea9d91d added edit icon 2014-10-21 10:39:53 +09:00
fred-fri
d24672d034 fixes and adding panel 2014-10-21 09:25:10 +09:00
3de0d83d2e Added feedback to save & add more users #2300 2014-10-20 23:13:18 +02:00
fred-fri
28c9506639 Merge remote-tracking branch 'origin/develop' into develop 2014-10-20 17:15:52 +09:00
fred-fri
fe43e2fb6a adding rwandagrade 2014-10-20 17:15:38 +09:00
847a47493b Removed unnecessary fields. 2014-10-20 09:58:16 +02:00
d58282d1ab Removed faulty back link. 2014-10-20 09:43:38 +02:00
fred-fri
aa06b60d09 switching places 2014-10-20 11:16:36 +09:00
fc5e1dc344 Test fixes. 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
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
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
fred-fri
2c6629fbb7 test 2014-10-17 18:00:09 +09: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
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
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