opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / models

2016-09-01	c2b20ab Browse files » added functionality to port users from old auth structure to new xsrust committed on 1 Sep 2016
	e1e8d50 Browse files » ensured users loose roles upon org changing and added depricated tags to roles xsrust committed on 1 Sep 2016
	b0d6d0e Browse files » updated documentation syntax for some models xsrust committed on 1 Sep 2016
	461829e Browse files » removed cancancan and rollify xsrust committed on 1 Sep 2016
	97431f7 Browse files » added granting api to orgs permission xsrust committed on 1 Sep 2016
	627576a Browse files » implimenting auth changes in the views xsrust committed on 1 Sep 2016
2016-08-31	e62c5da Browse files » fix various issues to do with display of formatting in questions Ray Carrick committed on 31 Aug 2016
2016-08-26	8128ceb Browse files » added docs to new function xsrust committed on 26 Aug 2016
	e65e65b Browse files » finished changes to update_user_permissions xsrust committed on 26 Aug 2016
	860a7f5 Browse files » made changed to user.rb xsrust committed on 26 Aug 2016
	0d974e0 Browse files » added debug to update_user_permissions xsrust committed on 26 Aug 2016
2016-08-23	b9c7b07 Browse files » turns out we do user user_org_roles to determine organisation, re-added xsrust committed on 23 Aug 2016
	3e331a1 Browse files » fixed bug in can_<do permission>? functions xsrust committed on 23 Aug 2016
	7f5fcdf Browse files » updated the organisation_id = (new) in user model, was causing seed to fail xsrust committed on 23 Aug 2016
	5f5b3b3 Browse files » updated funciton to ensure no dupelicates xsrust committed on 23 Aug 2016
	edbe39c Browse files » added functionality to port users from old auth structure to new xsrust committed on 23 Aug 2016
	2e19c2a Browse files » ensured users loose roles upon org changing and added depricated tags to roles xsrust committed on 23 Aug 2016
2016-08-22	8f296fe Browse files » Branding changes (#24) ... - Removed the description field from organisation - Added a contact email field to organization - Added an email address validator - Updated organisation logo upload so that the system will resize the image to the correct height rather than forcing the user to provide a 100x100 image - Change how the organisation logo is displayed * updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size. * 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 * changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications * Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen. Brian Riley authored on 22 Aug 2016 GitHub committed on 22 Aug 2016
	d7bab97 Browse files » updated documentation syntax for some models xsrust committed on 22 Aug 2016
	99dac87 Browse files » removed cancancan and rollify xsrust committed on 22 Aug 2016
	b5625e0 Browse files » added granting api to orgs permission xsrust committed on 22 Aug 2016
	1ff27cf Browse files » implimenting auth changes in the views xsrust committed on 22 Aug 2016
2016-08-18	b2e1bfe Browse files » bugfix to ensure organisations auth working xsrust committed on 18 Aug 2016
	4832762 Browse files » added pundit auth to organisations controller xsrust committed on 18 Aug 2016
	936e6bd Browse files » proof of concept for pundit ... -got the pundit policy file working -verified that it blocked/allowed users with correct permissions -fixed a bug in user model where the magic strings had been poorly defined - xsrust committed on 18 Aug 2016
	0b1e3cb Browse files » added magic string and constant structure for auth xsrust committed on 18 Aug 2016
2016-08-17	6dec11c Browse files » Merging current stable development branch into master (#23) ... This is our unofficial v.0.1.0 release. It includes: - Rails 4.2 migration - Internationalization - API - Institutional logo upload (thanks to Weiwei and the Univ. of Alberta) - Generic branding - General cleanup of code and bug fixes Brian Riley authored on 17 Aug 2016 GitHub committed on 17 Aug 2016
2016-08-17	9bf87cd Browse files » changed empty? to blank? as it broke seedfile Jimmy Angelakos authored on 17 Aug 2016 GitHub committed on 17 Aug 2016
2016-08-12	67c35e7 Browse files » fixed merge conflict in schema.rb Brian Riley committed on 12 Aug 2016
2016-08-12	8fe7792 Browse files » Merging master (#20) ... * added data structures for testing * renamed token_permission_type to plural to follow convention of fixtures * added gem to allow testing of controllers * began implimenting testing for projects controller * fixed auth to reject empty string * added data structures for testing * added data structures for testing * removed old unnecissary data structures from fixtures * added forgotten view for org-admins giving user's api permissions * updated .gitignore * added gem to allow testing of controllers * began implimenting testing for projects controller * fixed auth to reject empty string * added data structures for testing * added data structures for testing * removed old unnecissary data structures from fixtures * added forgotten view for org-admins giving user's api permissions * updated .gitignore * fixed leftover merge conflict in .gitignore * updated org-admin view of users for rails 4.2 compatability * fiexed a bug where user's api token permissions wouldnt display * fixed syntax error * changed guidance_group to guidance_groups for consistancy with api spec * fix roadmap route * bugfixing auth for api * removed token_permission as it was accidentially re-added by a merge * added gem to allow testing of controllers * began implimenting testing for projects controller * fixed auth to reject empty string * added data structures for testing * added data structures for testing * removed old unnecissary data structures from fixtures * added forgotten view for org-admins giving user's api permissions * updated .gitignore * removed old unnecissary data structures from fixtures * updated .gitignore * updated org-admin view of users for rails 4.2 compatability * fiexed a bug where user's api token permissions wouldnt display * fixed syntax error * changed guidance_group to guidance_groups for consistancy with api spec * bugfixing auth for api * modified schema * removed admin interface to token_permission, another forgotten side-effect * removed admin interface to token_permission, another forgotten side-effect * modified return structure of guidance_groups API to reflect current spec * removed guidances api endpoint as no longer necissary * added templates api endpoint * commit * commit * initial commit of untested statistics API * updated Statistics API and added bugfixes * added aditional seeds for api token_permission_types * added docs for stats api, also passing tests * added fucntionality to give org_admin priveleges through the org_admin interface * corrected statistics API to handle null dates and filter projects correctly * addedrestriction that users must be confirmed to be counted by stats api * added documentation to dmptemplates api controller * added org_id field to plans metadata as a returned plan can belong to somebody else's organisation * initial passover of removing magic strings * added comment to I18n_constant and fixed missing magic string * fixed the magic strings function * removed duplicate gem from gemfile * migrations and routes tests * changed gem dependancies and fixed syntax bug * fixed bug where show plans view only displayed first letter of columns * aliased * added documentation to organisation, phase, and part of plans * added documentation to organisation, phase, and part of plans * added documentation to model for plan * added documentation to project model * added documentation to project_group model * added documentation to remaining models * fixed admin logout bug * removed hard-coded references to DCC * fixed bug in dmptemplate with magicstrings * dropdown and org language setting * test * commit * migrations and routes tests * aliased * dropdown and org language setting * test * remove typo * fixed parentheses bug in api/projects_controller * fix * merging * remove git merge conflicts artifacts * added gemfile, environments, and an initaliser to allow merge * fix locales picking * super_admin area for languages, changes to langauge initializer to fix migrations issue and org language priority in user language picking * add association between organisation and language Damodar Sojka authored on 12 Aug 2016 Brian Riley committed on 12 Aug 2016