16722 Commits

Author SHA1 Message Date
b4eb6c086a Removed inferior duplicate version of display multiple users column. 2015-01-30 14:58:12 +01:00
bd7e3a8498 Improved method name. 2015-01-30 14:57:35 +01:00
golrokh
2083fa22af Merge remote-tracking branch 'origin/develop' into develop 2015-01-30 14:57:19 +01:00
golrokh
1c6d8ec94c Changed the title of interact with supervisor and added an info panel for extra info 2015-01-30 14:57:14 +01:00
e1eba8eb12 Merge remote-tracking branch 'origin/develop' into develop 2015-01-30 14:56:20 +01:00
3c50cda848 Added columns to display authors and head supervisor to rough draft and final seminar approvals. 2015-01-30 14:56:16 +01:00
golrokh
d6a947a7fa Merge remote-tracking branch 'origin/develop' into develop 2015-01-30 14:41:45 +01:00
golrokh
229e353e77 Added confirmation message before delete an activity template 2015-01-30 14:41:40 +01:00
e937a5c567 Tightened the class constraints a bit. 2015-01-30 14:12:03 +01:00
6439bd2281 Merge remote-tracking branch 'origin/develop' into develop 2015-01-30 14:10:27 +01:00
7a0d9ba284 Added new activity action "final seminar thesis". 2015-01-30 14:10:22 +01:00
golrokh
a1bed485a5 Merge remote-tracking branch 'origin/develop' into develop 2015-01-30 14:04:35 +01:00
golrokh
10af8cdc2f Changed Activity's description to Nullable 2015-01-30 14:02:22 +01:00
aa97c4dd2f Merge remote-tracking branch 'origin/develop' into develop 2015-01-30 13:57:29 +01:00
65291e70b6 Added new activity action "final thesis". 2015-01-30 13:57:22 +01:00
golrokh
a8126eabee Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2015-01-30 13:51:44 +01:00
golrokh
75cbadcca5 Fixed problem with saving checklists in activity templates 2015-01-30 13:51:33 +01:00
2c0ff56fa8 Added test to make sure the activity plan panel can handle all types of actions. 2015-01-30 13:29:17 +01:00
0a1b400a5c Removed stupid test. 2015-01-30 12:37:46 +01:00
a9decef4d1 Migrated activity plan templates to support new actions. 2015-01-30 10:57:21 +01:00
bfec3d7a5a Removed old uploadRequired attribute. 2015-01-30 10:43:18 +01:00
ef98964cfa Migrated activity plan panel to handle the new actions. 2015-01-30 10:19:20 +01:00
6a6336fc84 Refactored action to be a simple attribute of Activity rather than tacked on. While good in theory it will be problematic when adding activities from a template so better go with the simple solution. 2015-01-30 10:03:09 +01:00
181ad81349 Added database support for different kinds of actions to activities. 2015-01-29 14:36:22 +01:00
2d797d133a [SCIPRO-26427] Fixed updating of checklist answers.
Also fixed a few stale models.
release-73
2015-01-23 12:44:55 +01:00
1542c17bdf Fixed FinalSeminarServiceImplIntegrationTest. release-2015-01-21_01-43-10 2015-01-20 12:22:53 +01:00
13dd441e45 [SCIPRO-26424] Fixed problem when trying to add opponents at the same time as creating the final seminar. 2015-01-20 11:32:18 +01:00
1df06ae81c Improved AddUsersPanel to not copy/replace the model and instead reflect changes in it. 2015-01-20 11:31:00 +01:00
86a54668aa Changed ListAdapterModel to be derived from AbstractReadOnlyModel so it does not cache invalid data if the underlying model is changed. 2015-01-20 11:29:43 +01:00
21958609fa Removed useless page parameter variables. 2015-01-20 09:56:07 +01:00
8a19139f1c Delomboked stuff. 2015-01-20 09:53:17 +01:00
0365e74f2e [SCIPRO-26412] Fixed exporting notifications to Excel. 2015-01-19 09:38:17 +01:00
c7dab120db [SCIPRO-26410] Fixed lazy exception when opening the supervisor profile in interact with supervisor. 2015-01-19 09:26:37 +01:00
8d6c13bb7a Minor HTML fixes. 2015-01-16 14:05:21 +01:00
dc6b2b9767 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop release-2015-01-16_13-58-21 2015-01-16 13:29:16 +01:00
6dfe9dc596 Prepare for project delete phase 1 rollback 2015-01-16 13:28:57 +01:00
4bb4515331 Updated master criteria. 2015-01-16 12:38:13 +01:00
04b668b43b Minor CSS cleaning. 2015-01-15 16:08:18 +01:00
a2d9433893 Fixed font on supervisor project details page. 2015-01-15 16:05:21 +01:00
32950fa88d Fixed problem with the wrong event getting posted when approving or rejecting a reviewer request.
Not having enough type information is fun.
2015-01-15 10:51:22 +01:00
832f6ccccf Can't mix matchers and non-matchers. release-2015-01-14_23-29-05 2015-01-14 16:16:14 +01:00
f2d20d4b2f Merge remote-tracking branch 'origin/develop' into develop 2015-01-14 16:09:00 +01:00
985f716660 Made the grading report form hide itself when the checkbox is not checked. 2015-01-14 16:08:54 +01:00
137b2606e6 Display grading reports in the reviewer approval process panel. 2015-01-14 16:05:12 +01:00
71f9a01c77 Prepare for project delete phase 1fix 2015-01-14 15:49:31 +01:00
6a0f7185d2 Made it possible to attach a snapshot of the grading report when denying a request. 2015-01-14 15:36:23 +01:00
37c59cb60e Made it possible to attach a snapshot of the grading report when approving a request. 2015-01-14 15:27:43 +01:00
f830cb61d0 Prepare for project delete phase 1 2015-01-14 14:30:41 +01:00
71858369c2 Moved Scala files to src/main/scala from src/main/java 2015-01-14 11:07:58 +01:00
c0adfdba3a Fixed CSS warnings. 2015-01-13 16:33:50 +01:00