fred-fri
|
c24e7713af
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-02-19 16:36:51 +09:00 |
|
fred-fri
|
80b5700171
|
Merge branch 'ap2' into develop
|
2013-02-19 16:36:13 +09:00 |
|
fred-fri
|
f24b7f61b1
|
minor fixes to make saving idea work
|
2013-02-19 16:34:05 +09:00 |
|
fred-fri
|
4782b5e82a
|
made enter student idea page use methods that use exemptions
|
2013-02-19 15:52:42 +09:00 |
|
fred-fri
|
539a36b1b5
|
made showbuttons logic use methods that use exemptions
|
2013-02-19 15:44:00 +09:00 |
|
fred-fri
|
e694b3cfd5
|
added new getcurrentperiod method that takes a student which enables checking for exemptions
|
2013-02-19 15:34:42 +09:00 |
|
fred-fri
|
e9cb332d39
|
added new getcurrentperiod method that takes a student which enables checking for exemptions
|
2013-02-19 15:09:49 +09:00 |
|
fred-fri
|
6b29ed4eb2
|
added exemptions to student entity
|
2013-02-19 15:07:18 +09:00 |
|
fred-fri
|
08bd27fb0b
|
gui logic fix
|
2013-02-19 10:31:09 +09:00 |
|
fred-fri
|
cf05876a99
|
added logic that until date must be after end date
|
2013-02-19 10:19:53 +09:00 |
|
fred-fri
|
93be176c99
|
fixed ajax bug
|
2013-02-19 10:06:15 +09:00 |
|
Jona Ekenberg
|
02ff843007
|
mer update på forummockup
|
2013-02-18 17:08:52 +01:00 |
|
Jona Ekenberg
|
7315a109f4
|
mer uppdatering på forummockup
|
2013-02-18 17:00:14 +01:00 |
|
|
|
3fdf1cad9e
|
Panel now saves the external organization as changes are made.
|
2013-02-18 16:54:17 +01:00 |
|
Jona Ekenberg
|
5081e8a950
|
updated the forum mockup a bit more
|
2013-02-18 16:35:34 +01:00 |
|
|
|
080c27146d
|
Refactored test. Text field visibility toggled by clicking checkbox.
|
2013-02-18 16:28:49 +01:00 |
|
Jona Ekenberg
|
aff2dd9fc9
|
Merge branch 'fixaNYNYNYNY' into develop
|
2013-02-18 16:11:37 +01:00 |
|
Jona Ekenberg
|
fb0ee8e0a5
|
uppdaterat forummockup
|
2013-02-18 16:11:22 +01:00 |
|
|
|
04937d2a85
|
Supervisorexternalprojectpanel panel for displaying external organization information
|
2013-02-18 15:48:18 +01:00 |
|
|
|
d7c2a1699f
|
External organization information in project entity
|
2013-02-18 15:43:14 +01:00 |
|
fred-fri
|
0be7ca6387
|
some markup fixes
|
2013-02-18 16:57:12 +09:00 |
|
fred-fri
|
d2261fcc3f
|
some cleanup and improvements
|
2013-02-18 16:52:29 +09:00 |
|
fred-fri
|
8cf7ee4928
|
added artefact for adding exemptions
|
2013-02-18 16:25:59 +09:00 |
|
fred-fri
|
17ef48bfbe
|
made dialog longer
|
2013-02-18 15:33:17 +09:00 |
|
fred-fri
|
63dc9a82da
|
adding gui for exemptions
|
2013-02-18 13:28:34 +09:00 |
|
fred-fri
|
43f987007d
|
fixed lazy exception
|
2013-02-18 12:56:28 +09:00 |
|
fred-fri
|
ccc83532f5
|
added sql to current
|
2013-02-18 12:16:34 +09:00 |
|
fred-fri
|
83d2781799
|
added set with exemptions to application period
|
2013-02-18 12:05:21 +09:00 |
|
fred-fri
|
33f5db23c7
|
added applicationperiodexemption class
|
2013-02-18 11:50:11 +09:00 |
|
fred-fri
|
cd828fefef
|
added applicationperiodexemptionid class
|
2013-02-18 11:38:34 +09:00 |
|
|
|
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 |
|
