opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / lib

2017-01-25	e2bbcdb Browse files » fixed merge conflicts briley committed on 25 Jan 2017
2017-01-24	0b1701c Browse files » updated admin_phase view and partials associated with it to use new data access xsrust committed on 24 Jan 2017
2016-11-29	8c241cf Browse files » bugs found in fr dmponline Ray Carrick committed on 29 Nov 2016
2016-11-08	b9eecb4 Browse files » editing a guidance by question now shows template through question xsrust committed on 8 Nov 2016
	3e5930e Browse files » fixed bug where selecting guidance was impropperly filtering xsrust committed on 8 Nov 2016
	9f883c7 Browse files » Merge branch 'master' into postgresql Ray Carrick committed on 8 Nov 2016
2016-11-07	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-02	9bd0a56 Browse files » Corrected spelling of text_desription field in token_permission_types briley committed on 2 Nov 2016
2016-11-02	2685cc5 Browse files » merge postgresql -> master Ray Carrick committed on 2 Nov 2016
2016-10-28	1ff70a8 Browse files » added rake task to seed database with key values, additionally added rake task to perform all migration tasks xsrust committed on 28 Oct 2016
2016-10-26	88937d7 Browse files » resolving merge conflicts briley committed on 26 Oct 2016
2016-10-25	53a3095 Browse files » moved migrating user permissions to a rake task migrate:permissions xsrust committed on 25 Oct 2016
2016-10-12	cbe7335 Browse files » reverted changes to devise that were attempting to redirect users to the login page after session expiration. It was causing occassional sign_in issues due to a redirect loop briley committed on 12 Oct 2016
2016-10-10	ba058b6 Browse files » fixed typo in fr.yml locale file. Added custom failure app for devise that should redirect the user to the home page on a session timeout briley committed on 10 Oct 2016
	4ac8be8 Browse files » fixed typo with class name briley committed on 10 Oct 2016
	a4b5cad Browse files » Updated devise to redirect user to the home page after session expiration rather than the unauthorized page briley committed on 10 Oct 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-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