5994 Commits

Author SHA1 Message Date
fred-fri
e2c995e540 sonar 2014-09-25 10:28:39 +09:00
3ee5e91a4a Email is now set correctly when registering the first user. 2014-09-24 15:12:40 +02:00
golrokh
e903eaf1a9 set DEV profile to be active by default to prevent jira errors 2014-09-24 15:09:11 +02:00
da68ae430e Fixed test by adding missing mock implementation. 2014-09-24 14:44:22 +02:00
1f33955cf0 Fixed some i18n. 2014-09-24 14:39:58 +02:00
212387891a Saves the reason when supervisor creates final seminar without approval. 2014-09-24 14:30:09 +02:00
68e1a4c963 Merge remote-tracking branch 'origin/develop' into final_seminar_creation 2014-09-24 13:53:36 +02:00
55c511b68f Implemented case when the reviewer has not reached a decision yet. 2014-09-24 13:46:34 +02:00
95484abc74 Implemented case when the reviewer denied the request. 2014-09-24 13:11:57 +02:00
591153b3e7 Minor refactoring. 2014-09-24 09:19:20 +02:00
7795dce142 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-09-23 16:39:21 +02:00
63a8c278b6 Fix2 Improved the Grading tab 2014-09-23 16:36:50 +02:00
golrokh
6c708e5b79 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-09-23 15:12:06 +02:00
golrokh
f7451870c0 Added forum notification in admin/notification settigns/general settings 2014-09-23 15:11:56 +02:00
48c7f39cbd Fix Improved the Grading tab 2014-09-23 14:51:51 +02:00
5b2b2540c5 Merge remote-tracking branch 'origin/develop' into develop 2014-09-23 13:54:44 +02:00
dedd75f90f Improved the Grading tab 2014-09-23 13:54:09 +02:00
4b8b128f05 Bootstrapped-ified the forms for editing projects (admin and supervisor) as well as removed the hard-coded width of the AddUsersPanel, it is better to specify the width where the panel is used so it can fit in all situations. 2014-09-23 13:40:48 +02:00
7a4d0ff8d5 Bootstrapped-ified the final seminar form. 2014-09-23 13:13:10 +02:00
3e9e72faa6 Fixed some minor warnings. 2014-09-23 12:49:26 +02:00
golrokh
9ecb835096 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-09-23 12:42:32 +02:00
f437d5f5b3 Added screen-reader only label for the reason text area. 2014-09-23 12:28:57 +02:00
600cfea517 Added show/hide client side functionality for the reason text field. 2014-09-23 12:25:12 +02:00
fred-fri
a944b63548 cleanup 2014-09-23 19:07:05 +09:00
fred-fri
3ddefbd3b9 added confirmation 2014-09-23 19:06:28 +09:00
7224231e91 Hooked up logic for when there is a reviewer but no request. 2014-09-23 11:28:01 +02:00
golrokh
74e0ed1414 Merge branch 'forum-mail-notification' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-09-23 11:19:09 +02:00
fred-fri
1c13dff744 only display templates of same level as project 2014-09-23 18:04:07 +09:00
fred-fri
e11b4c5526 checklist fix 2014-09-23 17:31:28 +09:00
fred-fri
0de469674f argh checklist 2014-09-23 14:32:00 +09:00
fred-fri
df1b318325 password stuff 2014-09-23 13:40:47 +09:00
fred-fri
4ece578bd8 password stuff 2014-09-23 13:40:01 +09:00
fred-fri
d35b684efe cleanup 2014-09-23 13:10:22 +09:00
fred-fri
59dd74417d fixes 2014-09-23 13:09:38 +09:00
fred-fri
ca4181bca4 supervisor stuff 2014-09-23 10:50:13 +09:00
fred-fri
b3cd62c54c tests 2014-09-23 10:19:20 +09:00
fred-fri
08b6f4b5b4 refactoring into panel 2014-09-23 09:42:07 +09:00
9fc4441dc0 Simple method rename. 2014-09-22 16:54:32 +02:00
31284c82ee Renamed FinalSeminarCreationApproval to FinalSeminarCreationReviewerApproval and added NoReviewer as a possible case. 2014-09-22 16:54:17 +02:00
b42fd86f71 Injected FinalSeminarCreationService into SeminarCRUDPanel and hooked up simple logic when trying to create the final seminar. 2014-09-22 16:50:51 +02:00
d43450494c SeminarCRUDPanel converted to Scala. 2014-09-22 16:08:56 +02:00
golrokh
2f38211cc2 Work in progress 2014-09-22 15:08:44 +02:00
e23258a877 What is this test doing here? (Also it does not test anything since there is no functionality for disabling that specific date field. 2014-09-22 12:27:36 +02:00
fred-fri
1720d44f21 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-09-22 14:22:23 +09:00
fred-fri
100b9f16b1 cleanup 2014-09-22 14:19:46 +09:00
fred-fri
c2215cc792 blargh 2014-09-22 14:05:46 +09:00
fred-fri
fc4fe69c11 verify 2014-09-22 14:04:28 +09:00
fred-fri
32b1b6dcba nasty users 2014-09-22 13:58:26 +09:00
fred-fri
9231e1590a trigger 2014-09-22 13:33:14 +09:00
fred-fri
61c14f2f7c adding stuff, making page work 2014-09-22 13:03:18 +09:00