opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / controllers / application_controller.rb

2016-11-07	3ad2571 Browse files » renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages Brian Riley committed on 7 Nov 2016
	ebe2155 Browse files » removed ability to customize view branding folder name. It will just be called branded now Brian Riley committed on 7 Nov 2016
	639cc59 Browse files » moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views Brian Riley committed on 7 Nov 2016
2016-11-03	7af4d09 Browse files » Bug fix to the column layout handler on the view plans page briley committed on 3 Nov 2016
2016-11-02	4a4b784 Browse files » fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form. briley committed on 2 Nov 2016
2016-11-01	f8fe6d2 Browse files » updated application controller so that a user is redirected to the main landing page when then try to access a secure page when not logged in. Added the corresponding locale messages that will be displayed when this happens briley committed on 1 Nov 2016
2016-10-10	59d69cd Browse files » Fixes to the users page briley committed on 10 Oct 2016
2016-10-04	0013c03 Browse files » updated actionmailer to use the hostname when adding urls to emails. Also fixed bug in [object]_path route helpers contained within an ActionMailer view. ActionMailer was not proviing the localization portion of the url. Manually including the default locale now in links to the project briley committed on 4 Oct 2016
2016-09-28	29ea9e0 Browse files » Added fix for issues when displaying column headings on the view plans page. Setup and 'Unknown' column heading that defaults to ' - ' but is updateable in the locale files. If there are issues determining the column heading it will use that value briley committed on 28 Sep 2016
2016-09-16	802d6d8 Browse files » removed verify_authorized out to individual controllers xsrust committed on 16 Sep 2016
2016-09-16	e718059 Browse files » forced all actions to be authenticated through pundit xsrust committed on 16 Sep 2016
2016-09-01	a7e48fc Browse files » Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes briley committed on 1 Sep 2016
	170cd43 Browse files » merged DCC changes into master briley committed on 1 Sep 2016
	c51c970 Browse files » removed cancancan and rollify xsrust committed on 1 Sep 2016
	ad3dd26 Browse files » implimenting auth changes in the views xsrust committed on 1 Sep 2016
2016-08-18	7429952 Browse files » added default redirect to 403 page for unauth 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
	2fafd99 Browse files » installed new gem pundit 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-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
2016-08-12	ceb4829 Browse files » super_admin area for languages, changes to langauge initializer to fix migrations issue and org language priority in user language picking DamodarSojka committed on 12 Aug 2016
2016-08-10	ed935d3 Browse files » fix locales picking DamodarSojka committed on 10 Aug 2016
	adc897e Browse files » migrations and routes tests DamodarSojka authored on 4 Aug 2016 Damodar committed on 10 Aug 2016
	b0ff010 Browse files » commit DamodarSojka authored on 28 Jul 2016 Damodar committed on 10 Aug 2016
2016-08-04	135d359 Browse files » fixed the magic strings function xsrust committed on 4 Aug 2016
2016-08-04	c601639 Browse files » added comment to I18n_constant and fixed missing magic string xsrust committed on 4 Aug 2016
2016-08-03	bb81f86 Browse files » initial passover of removing magic strings xsrust committed on 3 Aug 2016
2016-07-22	0e5ec7d Browse files » localization based on url DamodarSojka committed on 22 Jul 2016
2016-07-15	99234ab Browse files » localization further work, including dropdown initial work DamodarSojka committed on 15 Jul 2016
2016-06-03	dbeb039 Browse files » DMPonline4 - RAILS 4.0 (#4) ... Merging the initial DMPOnline4 codebase into Roadmap DMPonline4, this code was designed and implemented by the Digital Curation Centre (DCC) DMPonline runs in Ruby 2.1 and Rails 4.0, there is a mysql database. Marta Ribeiro authored on 3 Jun 2016 Brian Riley committed on 3 Jun 2016