|
|
302c134b19
|
Add logout button for local users
release-74
|
2015-02-05 16:09:48 +01:00 |
|
|
|
badcf05bdc
|
Updated git mailmap.
|
2015-02-05 15:56:03 +01:00 |
|
golrokh
|
9d21068737
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-05 12:27:33 +01:00 |
|
golrokh
|
23c70e6a3b
|
Requested column added to the reviewer panels
|
2015-02-05 12:27:23 +01:00 |
|
|
|
55a02d9c02
|
Sigh.
|
2015-02-05 11:03:24 +01:00 |
|
|
|
20ee5982b9
|
[SCIPRO-26519] Fixed problem opening student profile from supervisors project overview of active participants.
(Note to self: detach models correctly)
|
2015-02-05 10:19:00 +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 |
|
|
|
295d815f80
|
[SCIPRO-26332] Fixed problem when trying to download a file with invalid id.
There was a reason PublicFileDescriptionService#findOne returned an Option and that was not so you could call #get on it.
|
2015-02-05 10:08:18 +01:00 |
|
|
|
142ea100cb
|
Notification that a first meeting has not been booked at course start.
|
2015-02-04 16:14:59 +01:00 |
|
|
|
62a725aeb3
|
Fixed test.
|
2015-02-04 10:28:02 +01:00 |
|
|
|
73d3916461
|
Made the tabs for the supervisors grading reports in the reviewers grading report view super-explicit.
|
2015-02-04 10:07:40 +01:00 |
|
|
|
675724ddd9
|
Added stupid title explaining what the "Interact with supervisor" is.
|
2015-02-04 10:04:30 +01:00 |
|
|
|
779bf391da
|
Cleaning.
|
2015-02-04 09:56:22 +01:00 |
|
|
|
7e95f9ce4e
|
Fixed problem when trying to update a user without changing email (it is not unique but it belongs to the current user.)
|
2015-02-04 09:54:40 +01:00 |
|
|
|
e1cb343cd1
|
Minor clean up.
|
2015-02-04 09:51:07 +01:00 |
|
|
|
a09a707465
|
Fixed test.
|
2015-02-04 09:47:51 +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 |
|
|
|
9f23850618
|
Removed title truncation for reviewers.
|
2015-02-04 09:20:13 +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 |
|
|
|
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 |
|
