17140 Commits

Author SHA1 Message Date
b76d7bda04 Peer notifications turned off for supervisor, co-supervisor and reviewer. 2013-02-15 13:46:06 +01:00
e4044892a7 Added role service mock to context in SciProTest.
Added role service mock to context in TestSortableDataProvider unit test.
2013-02-15 12:53:46 +01:00
0db8db61bd Merge branch 'feature/examiner' into develop 2013-02-15 12:47:36 +01:00
17e05a1ab4 User table is now lazily loaded instead of waiting to render the page until it is loaded completely. 2013-02-15 12:44:57 +01:00
31b36c8cab Role management page now includes all managed roles (as defined in the Roles enum) as well as a better filter. 2013-02-15 12:15:40 +01:00
63f3c2d788 Pageable filtered queries in user service 2013-02-15 12:10:56 +01:00
143b1b68f2 Need new hibernate version 2013-02-15 12:05:51 +01:00
de8daad406 Examiner authentication role. 2013-02-15 10:16:29 +01:00
22393a3d50 Admin role management can now specify and filter on Examiner role.
The user text search speed has been vastly improved by throttling the number of requests so not one new request is sent to the server each key press.
2013-02-15 10:01:02 +01:00
aa12ddcfbc Deleting a users role is no longer a read only operation 2013-02-15 08:40:51 +01:00
fred-fri
0a16449574 Merge branch 'release20130215' 20130215 2013-02-15 11:46:29 +09:00
fred-fri
07286f22d5 added new db file 2013-02-15 11:21:09 +09:00
fred-fri
5db796ad79 small markup fix 2013-02-15 11:08:35 +09:00
fred-fri
5008d192e9 changed tabs back to 110% size 2013-02-15 10:38:28 +09:00
fred-fri
714444552a added authorization sysadmin for forum mockup 2013-02-15 10:21:03 +09:00
Jona Ekenberg
747ddf2697 made css/js-files local for the mockup 2013-02-14 17:41:03 +01:00
Jona Ekenberg
2e1b59971e fixade bugg i forummockup 2013-02-14 17:28:32 +01:00
Jona Ekenberg
986165a63d added htmlmockups
Merge branch 'fixaHTMLMockupsForum' into develop
2013-02-14 17:12:41 +01:00
Jona Ekenberg
6a12ca0e58 fixed small things with forummockups 2013-02-14 17:10:56 +01:00
Jona Ekenberg
0f6abac70d made the forum mockups a bit nicer looking 2013-02-14 16:58:01 +01:00
8b217dd480 User service can search based on roles 2013-02-14 16:32:13 +01:00
d36f627a33 Role service delete roles. 2013-02-14 14:43:04 +01:00
d67f823cf7 Role service now takes lazy deletion into account 2013-02-14 14:37:08 +01:00
1547c21255 hasRole method for role service 2013-02-14 14:00:38 +01:00
Jona Ekenberg
da18a2c97c added forummockups 2013-02-14 13:50:34 +01:00
998f90f0ec Managed list is now a static method in Roles enum 2013-02-14 13:45:58 +01:00
6d4cd71178 Role service method for adding role to user. 2013-02-14 13:16:12 +01:00
8ca0099025 TurnItIn expiration worker is now scheduled at 4am 2013-02-14 11:12:34 +01:00
fred-fri
0c2b5476d5 added sending of mail to importer and moved a log print 2013-02-14 15:46:29 +09:00
fred-fri
49e3295833 made turnitinexpirationworker use the strings instead of users 2013-02-14 15:25:44 +09:00
fred-fri
2a5108b2c2 added sql and some logic 2013-02-14 15:22:36 +09:00
fred-fri
f38f53dd39 added set of strings to mailevent 2013-02-14 14:51:06 +09:00
fred-fri
73e8f9ce52 Merge branch 'noti' into develop 2013-02-14 12:22:24 +09:00
fred-fri
6dcf876aa8 some cleanup 2013-02-14 12:05:23 +09:00
fred-fri
80cf0a9bc4 added a test 2013-02-14 11:37:38 +09:00
fred-fri
6412df2d32 cleaned up tests 2013-02-14 11:13:56 +09:00
fred-fri
3dccd6f3d1 path was wrong 2013-02-13 17:19:43 +09:00
fred-fri
5b2d7be818 test fails 2013-02-13 17:13:11 +09:00
fred-fri
d9ae90d5c4 added sql 2013-02-13 16:17:55 +09:00
fred-fri
858310a0e2 added gui 2013-02-13 16:15:46 +09:00
fred-fri
2d88bdceac added alarm mail list attribute to generalsystemsettings entity 2013-02-13 16:05:29 +09:00
fred-fri
7e7da164c5 added logic and warning 2013-02-13 15:30:56 +09:00
fred-fri
dd8b78f76d added a remove thesis link to seminar panel 2013-02-13 15:25:58 +09:00
fred-fri
387e262e90 added status filtering to project management page 2013-02-13 14:45:50 +09:00
fred-fri
b66ad09b7c added source 2013-02-13 12:52:39 +09:00
fred-fri
79edf96355 added comments that describe the problem 2013-02-13 11:23:50 +09:00
fred-fri
7dbeea75a0 implemented check 2013-02-12 16:29:09 +09:00
fred-fri
705cd77708 found where to check if supervisor has changed 2013-02-12 15:28:15 +09:00
cde369fca0 URL fixed for research areas. 2013-02-11 16:19:08 +01:00
fa8552c98e Merge branch 'feature/turnitin_expiration_warning' into develop 2013-02-11 15:41:33 +01:00