golrokh
|
8bc6772dd1
|
fixed tests
|
2015-02-26 12:06:28 +01:00 |
|
golrokh
|
a8ec091357
|
Changed _ to .
|
2015-02-26 11:32:58 +01:00 |
|
|
|
7dfe568fbd
|
Changed text in reviewer approvals.
EnumLabel galore.
|
2015-02-26 11:21:11 +01:00 |
|
golrokh
|
4b78574bd1
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2015-02-26 10:54:26 +01:00 |
|
golrokh
|
ec85ea0b0b
|
Added info text above supervisor and student forums
|
2015-02-26 10:37:01 +01:00 |
|
|
|
b1fdd00496
|
Fixed test.
|
2015-02-26 10:36:50 +01:00 |
|
|
|
0df2052242
|
Fixed so that admins can change local users password.
|
2015-02-26 10:31:42 +01:00 |
|
|
|
97b97ecdb1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-26 10:28:03 +01:00 |
|
|
|
da4f8bbc9f
|
Adding a template as a plan and creating a template from a plan now uses work days rather than calendar days.
|
2015-02-26 10:27:32 +01:00 |
|
|
|
bf1249c03d
|
Added the ability to change start date in the activity plan template preview.
|
2015-02-26 10:16:48 +01:00 |
|
|
|
dfac8847dc
|
Of course a stateful copy of the activity templates are kept in memory so we can't preview an activity plan, only a List<ActivityTemplates>.
|
2015-02-26 10:08:01 +01:00 |
|
|
|
cd1d11fac7
|
Improved HTML.
|
2015-02-26 09:57:33 +01:00 |
|
|
|
8e399008b5
|
Created a panel to preview an activity plan template.
|
2015-02-26 09:54:25 +01:00 |
|
|
|
d67285315c
|
Fixed bug when calculating work days ahead.
|
2015-02-26 09:53:41 +01:00 |
|
golrokh
|
bff292efe5
|
minor changes for better code
|
2015-02-26 09:45:01 +01:00 |
|
golrokh
|
89fdc61bb7
|
Fixed wrong usage of the constant param
|
2015-02-26 09:41:19 +01:00 |
|
|
|
cf5efcb54b
|
Seriously stop using toString for presentation purposes.
|
2015-02-25 15:32:18 +01:00 |
|
golrokh
|
5c9b2ef1fa
|
Made 'grading completeg' milestone as completed when supervisor set kursbetyg in daisy
|
2015-02-25 14:39:43 +01:00 |
|
|
|
af4a8a7ac5
|
Only admin role (instead of sysadmin) is required to edit users.
|
2015-02-25 10:59:41 +01:00 |
|
|
|
42b0a8bba6
|
Re-arranged supervisor notification settings.
|
2015-02-24 15:00:04 +01:00 |
|
golrokh
|
a4b5822181
|
Removed unused code for activity dialog
|
2015-02-24 14:44:44 +01:00 |
|
golrokh
|
b3ae46a10a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-24 14:38:16 +01:00 |
|
|
|
6188cbda64
|
Fixed problem when Turnitin upload fails for the first time.
|
2015-02-24 14:40:21 +01:00 |
|
golrokh
|
47f1edbf3e
|
Fixed the problem with menu hierarchy in supervisor my ideas
|
2015-02-24 14:38:02 +01:00 |
|
golrokh
|
406850138d
|
Better page for viewing idea details
|
2015-02-24 14:19:20 +01:00 |
|
|
|
d7093803f5
|
It is now possible (with modern browsers) to attach multiple files to forum posts. How-to depends on browser.
|
2015-02-24 14:12:19 +01:00 |
|
|
|
4cce8c6927
|
Added confirmation dialog when toggling notification settings.
|
2015-02-24 13:57:25 +01:00 |
|
|
|
527647ab37
|
Added the users own profile image to the basic profile page so they can see it while editing.
|
2015-02-24 13:53:22 +01:00 |
|
|
|
df23fda4cb
|
Bootstrapped HTML.
|
2015-02-24 13:48:05 +01:00 |
|
|
|
b19cb9ef62
|
Reshuffled the permissions for the Users part of the admin interface. Admin role can now edit local users and give/remove all roles that their own roles are authorized for.
|
2015-02-24 13:27:12 +01:00 |
|
|
|
47e6ff5dd3
|
Added confirmation dialog when giving/removing roles.
|
2015-02-24 13:17:20 +01:00 |
|
|
|
6a15850939
|
It is now possible to add projects to your group where you are only co-supervisor.
|
2015-02-24 12:54:50 +01:00 |
|
golrokh
|
e508fb922b
|
Implemented showing Idea detail in a new page not in a popup
|
2015-02-24 11:06:30 +01:00 |
|
golrokh
|
7fb33bc658
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-24 11:01:59 +01:00 |
|
golrokh
|
fdab5fc760
|
Implemented showing Idea detail in a new page not in a popup
|
2015-02-24 11:01:48 +01:00 |
|
|
|
704d426938
|
Added breadcrumbs for rough draft and final seminar approvals.
|
2015-02-24 10:28:14 +01:00 |
|
|
|
25f3e8cd94
|
Tiny HTML changes.
|
2015-02-24 10:28:14 +01:00 |
|
golrokh
|
b5ff16c64c
|
Removed the links for popup in activities
|
2015-02-24 08:35:37 +01:00 |
|
|
|
f464b4d0b2
|
Breadcrumbs for preliminary grading reports, final grading reports and interact with supervisors.
|
2015-02-23 15:55:51 +01:00 |
|
|
|
c643d593e0
|
Fixed migration script.
|
2015-02-23 15:54:18 +01:00 |
|
|
|
c287bebb94
|
Removed unused ForumPost field from GroupEvent and ProjectForumEvent
|
2015-02-23 15:20:01 +01:00 |
|
|
|
c4c77a0f12
|
Stupid IntelliJ converting to deprecated procedure syntax.
|
2015-02-23 15:12:24 +01:00 |
|
|
|
d1cb25a7ab
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-23 15:07:06 +01:00 |
|
|
|
22d4921140
|
Fixed a bug from previous implementation of marking notifications read that caused the entire forum to be read when reading a single thread.
|
2015-02-23 15:06:57 +01:00 |
|
|
|
cfb5bd744f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-23 15:01:39 +01:00 |
|
|
|
48f6ed982b
|
Made it so reading a forum post now always mark the related notification(s) as read.
|
2015-02-23 15:01:34 +01:00 |
|
golrokh
|
a11156b648
|
Moved the idea download link up
|
2015-02-23 14:59:35 +01:00 |
|
golrokh
|
587b214565
|
In Activity plan, show description for activities if there is any
|
2015-02-23 14:45:34 +01:00 |
|
|
|
0e77a2d110
|
When reading a forum post an event goes out to indicate that a user just read a post.
|
2015-02-23 13:26:53 +01:00 |
|
|
|
4ef655133b
|
Made (some) of the notification controllers method return the notifications they generated.
|
2015-02-23 13:10:10 +01:00 |
|
