GitBucket
| 2016-08-26 |
finished changes to update_user_permissions
xsrust
committed
on 26 Aug 2016
|
|---|---|
|
fixed merge conflicts
xsrust
committed
on 26 Aug 2016
|
|
|
made changed to user.rb
xsrust
committed
on 26 Aug 2016
|
|
|
made changes to update user permissions
xsrust
committed
on 26 Aug 2016
|
|
|
added debug to update_user_permissions
xsrust
committed
on 26 Aug 2016
|
|
| 2016-08-23 |
turns out we do user user_org_roles to determine organisation, re-added
xsrust
committed
on 23 Aug 2016
|
|
fixed bug in can_<do permission>? functions
xsrust
committed
on 23 Aug 2016
|
|
|
updated the organisation_id = (new) in user model, was causing seed to fail
xsrust
committed
on 23 Aug 2016
|
|
|
updated funciton to ensure no dupelicates
xsrust
committed
on 23 Aug 2016
|
|
|
added functionality to port users from old auth structure to new
xsrust
committed
on 23 Aug 2016
|
|
|
ensured users loose roles upon org changing and added depricated tags to roles
xsrust
committed
on 23 Aug 2016
|
|
| 2016-08-22 |
 |
|
Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.
briley
committed
on 22 Aug 2016
|
|
|
changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications
briley
committed
on 22 Aug 2016
|
|
|
removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly
briley
committed
on 22 Aug 2016
|
|
|
removed initalizer for rollify
xsrust
committed
on 22 Aug 2016
|
|
|
updated documentation syntax for some models
xsrust
committed
on 22 Aug 2016
|
|
|
removed cancancan and rollify
xsrust
committed
on 22 Aug 2016
|
|
|
Merge branch 'restructuring_authorisation' of https://github.com/DigitalCurationCentre/roadmap into restructuring_authorisation
xsrust
committed
on 22 Aug 2016
|
|
|
added granting api to orgs permission
xsrust
committed
on 22 Aug 2016
|
|
|
implimenting auth changes in the views
xsrust
committed
on 22 Aug 2016
|
|
| 2016-08-19 |
added granting api to orgs permission
xsrust
committed
on 19 Aug 2016
|
|
implimenting auth changes in the views
xsrust
committed
on 19 Aug 2016
|
|
| 2016-08-18 |
Merge pull request #4 from raycarrick-ed/master
...
raycarrick-ed
authored
on 18 Aug 2016
GitHub
committed
on 18 Aug 2016
|
|
Merge branch 'question_lists'
Ray Carrick
committed
on 18 Aug 2016
|
|
|
explicit bullet style for questions and raw questoin test in form
Ray Carrick
committed
on 18 Aug 2016
|
|
|
bugfixes to auth
xsrust
committed
on 18 Aug 2016
|
|
|
Merge branch 'restructuring_authorisation' of https://github.com/DigitalCurationCentre/roadmap into restructuring_authorisation
xsrust
committed
on 18 Aug 2016
|
|
|
updated seeds file
xsrust
committed
on 18 Aug 2016
|
|
|
finished implimenting new authorization scheme in dmptemplates
xsrust
committed
on 18 Aug 2016
|