16941 Commits

Author SHA1 Message Date
61584ba3e4 Fixed so the "additional message" gets saved for idea-based notifications. 2015-02-02 15:46:38 +01:00
f0d114b485 Improved the contents of the first meeting notification. Now includes date, room and description. (Bit of a hack to fit in three values). 2015-02-02 15:33:53 +01:00
76fd29d43f Made the supervisor description for first meeting show as a multi line label to preserve the formatting and not be a stupid wall of text. 2015-02-02 14:44:47 +01:00
b2db9db928 Changed "EXPORT_SUCCESS" notification to be project based and link to the overview. 2015-02-02 14:13:12 +01:00
golrokh
5d3027cddb Automatic milestone: Rough draft approval requested 2015-02-02 12:39:27 +01:00
387d395db2 Added "Supervisor approves final thesis" as a possible event for activating milestones. 2015-02-02 12:24:51 +01:00
3301562deb Fixed date offsets when saving activity plans as templates for future use. 2015-02-02 10:59:23 +01:00
ee37ff2321 Truncated title in the reviewers approval tabs (because we like empty space). 2015-02-02 10:25:56 +01:00
8e006880a8 Truncated title in the reviewers final grading report tab (because we like empty space). 2015-02-02 10:22:17 +01:00
golrokh
2b8d3bf059 the text fixed as janne said! 2015-02-02 09:50:04 +01:00
golrokh
d5e90ea701 Merge remote-tracking branch 'origin/develop' into develop 2015-02-02 09:48:28 +01:00
9e3670cc58 Fixed test after column reordering. 2015-01-30 16:13:34 +01:00
aada364c0b Changed link to bookmarkable from ajax. 2015-01-30 16:09:04 +01:00
golrokh
396f479535 Merge remote-tracking branch 'origin/develop' into develop 2015-01-30 16:08:41 +01:00
golrokh
67a2f9c2c7 new event added for "rough draft sent to reviewer for approval" 2015-01-30 16:08:36 +01:00
e38153eb78 Changed columns in reviewers table for final grading reports. Now similar to the approvals; Title, Deadline, Authors, Supervisor. 2015-01-30 15:53:19 +01:00
1a9b0ff193 Changed title of profile dialogs to "Profile for <person>" from "Profile for user <person>". 2015-01-30 15:49:12 +01:00
9f2d5a722b Merge remote-tracking branch 'origin/develop' into develop 2015-01-30 15:06:37 +01:00
57b816aa47 Refactored so more parts of the system use the new MultipleUsersColumn. 2015-01-30 15:06:32 +01:00
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