opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / views / devise / passwords

2017-08-11	c5e5304 Browse files » wrapped each page's h1 header in a row + col-md-12 DMPRoadmap/roadmap#553 Brian Riley committed on 11 Aug 2017
2017-07-20	1885143 Browse files » fixed alignment of page title/descriptions. Also fixed some styling issues with contact us and org details pages DMPRoadmap/roadmap#424 briley committed on 20 Jul 2017
2017-07-11	b02b9e6 Browse files » Merge branch 'CDL-MVP' into issue483 Jose Lloret committed on 11 Jul 2017
2017-07-11	3ae6c30 Browse files » FormHelpers for registrations views. DMPRoadmap/roadmap#483 ... FormHelpers for plan views. DMPRoadmap/roadmap#483 FormHelpers for shared views. DMPRoadmap/roadmap#483 fixed typo at views/plans/_available_templates.html.erb. DMPRoadmap/roadmap#483 Jose Lloret committed on 11 Jul 2017
2017-07-10	9d72b08 Browse files » added role tags to buttons throughout the site, addresses #138 xsrust committed on 10 Jul 2017
2017-06-23	8a283cd Browse files » cleaned up references to js files in views Brian Riley committed on 23 Jun 2017
2017-06-22	992185e Browse files » css rewrite briley committed on 22 Jun 2017
2017-06-09	8baad0f Browse files » cleanup of tabs and objects that are no longer in use DMPRoadmap/roadmap#305 ... (cherry picked from commit `754a4e0`) Brian Riley committed on 9 Jun 2017
	d2ea631 Browse files » resolved cherry-pick conflicts Brian Riley committed on 9 Jun 2017
	b3f71e5 Browse files » resolved cherry-pick conflicts briley authored on 1 Jun 2017 Brian Riley committed on 9 Jun 2017
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-27	33dab23 Browse files » Master (#7) ... * Update license (merging Marta's change that added Univ. of Glasgow to the text) Update license to include University of Glasgow. * Added API and Localisation work API development done by Sam Rust - xsrust Localisation work done by Damodar Sojka - DamodarSojka DigitalCurationCentre authored on 27 Jun 2016 Brian Riley committed on 27 Jun 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