|
|
8a1647ffe1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-11 16:20:54 +01:00 |
|
|
|
feffc7287f
|
Made the final seminar activity's action "FINAL_SEMINAR".
|
2015-02-11 16:20:44 +01:00 |
|
|
|
fbd5c5bfc5
|
Tiny refactor.
|
2015-02-11 16:19:59 +01:00 |
|
|
|
5cce53fa3a
|
Hooked up the final seminar activity handler to react to moved seminars and also move the activity.
|
2015-02-11 16:10:06 +01:00 |
|
|
|
b53f1066ce
|
Implemented service method to move a final seminar with proper validation logic.
|
2015-02-11 15:40:01 +01:00 |
|
|
|
334d630ed7
|
Tiny refactor.
|
2015-02-11 15:37:36 +01:00 |
|
|
|
94e805f5e9
|
De-Lombok'd some stuff.
|
2015-02-11 15:35:20 +01:00 |
|
golrokh
|
d768015270
|
Fixed Sonar stuff
|
2015-02-11 15:07:34 +01:00 |
|
golrokh
|
a7f1a96580
|
Fixed Sonar stuff
|
2015-02-11 15:02:20 +01:00 |
|
|
|
cbbfd3f3fa
|
Add language to peer request part 1
|
2015-02-11 14:45:21 +01:00 |
|
|
|
11e90cd42f
|
Active participant can delete themselves
|
2015-02-10 12:35:04 +01:00 |
|
|
|
611dae548b
|
[SCIPRO-26527] Fixed problem with first meeting reminder worker if there are no first meetings in the database.
|
2015-02-09 13:11:36 +01:00 |
|
|
|
5679f2c240
|
[SCIPRO-26634] Changed peer request deleted event to peer request cancelled event and change so that it is only posted when the request is cancelled.
|
2015-02-09 12:41:49 +01:00 |
|
|
|
933f915f21
|
Changed "Final seminar created before" filter to a between filter in Admin / Statistics / FInal seminars.
|
2015-02-09 10:18:06 +01:00 |
|
golrokh
|
afcf2d21cd
|
Download Idea as a txt file
|
2015-02-06 12:06:51 +01:00 |
|
golrokh
|
6a82ba3a93
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/notifications/notifications.properties
|
2015-02-05 10:12:23 +01:00 |
|
|
|
142ea100cb
|
Notification that a first meeting has not been booked at course start.
|
2015-02-04 16:14:59 +01:00 |
|
|
|
bfaa242c9c
|
Changed the contents and title of the first meeting mail.
|
2015-02-04 09:37:23 +01:00 |
|
|
|
22659c8736
|
Fixed version conflict with SQL migrations.
|
2015-02-04 09:33:54 +01:00 |
|
|
|
ee075edeeb
|
Bleh stupid frameworks.
|
2015-02-04 09:32:13 +01:00 |
|
|
|
b053626014
|
Ugh Lombok.
|
2015-02-04 09:23:17 +01:00 |
|
|
|
18859b4010
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2015-02-03 17:45:22 +01:00 |
|
|
|
c50079af28
|
Worker to remind people about booking first meetings. 2 and 5 work days before the application period is set to start.
|
2015-02-03 17:38:34 +01:00 |
|
|
|
a419e010e1
|
Add supervisor comment to decision
|
2015-02-03 17:23:23 +01:00 |
|
golrokh
|
8552ab4e39
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/notifications/notifications.properties
|
2015-02-02 16:26:46 +01:00 |
|
golrokh
|
17885157ad
|
Show idea modal when click on a idea-notification
|
2015-02-02 16:25:28 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
golrokh
|
67a2f9c2c7
|
new event added for "rough draft sent to reviewer for approval"
|
2015-01-30 16:08:36 +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
|
75cbadcca5
|
Fixed problem with saving checklists in activity templates
|
2015-01-30 13:51:33 +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 |
|
|
|
1542c17bdf
|
Fixed FinalSeminarServiceImplIntegrationTest.
|
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 |
|
|
|
8a19139f1c
|
Delomboked stuff.
|
2015-01-20 09:53:17 +01:00 |
|
|
|
dc6b2b9767
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2015-01-16 13:29:16 +01:00 |
|
|
|
6dfe9dc596
|
Prepare for project delete phase 1 rollback
|
2015-01-16 13:28:57 +01:00 |
|
