opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / views / shared

2017-04-12	6909f09 Browse files » change docx export to htmltoword. Hopefully fixes: #217 ray.carrick committed on 12 Apr 2017
2017-04-04	7a0fc55 Browse files » Fixed Exporting settings. It works per phase. DMPRoadmap/roadmap#197 Jose Lloret committed on 4 Apr 2017
2017-03-14	facecda Browse files » change from serialized hash tp just using includes ray.carrick committed on 14 Mar 2017
2017-02-15	a1dc48f Browse files » trying to fix settings routes and views Ray Carrick committed on 15 Feb 2017
	b4389d8 Browse files » mege in head changes Ray Carrick committed on 15 Feb 2017
	ab0988f Browse files » trying to reduce data access queries. Needs more work Ray Carrick committed on 15 Feb 2017
2017-02-14	22712e4 Browse files » views/shared and views/layours converted to gettext_rails Jose Lloret committed on 14 Feb 2017
2017-02-10	776eabf Browse files » started the migration from i18n to gettext Jose Lloret committed on 10 Feb 2017
2017-02-02	51e933e Browse files » fixed a few merge conflicts briley committed on 2 Feb 2017
	d0825df Browse files » added theme unit tests and started cleanup of remaining existing tests briley committed on 2 Feb 2017
	261beeb Browse files » merge in changes from origin Ray Carrick committed on 2 Feb 2017
	fd3280f Browse files » first port of plan creation and editing to new data model Ray Carrick committed on 2 Feb 2017
2017-01-26	f18ea4d Browse files » resolved merge conflicts briley committed on 26 Jan 2017
2016-12-12	9ea9518 Browse files » replaces Organisation. with Org. in all files xsrust committed on 12 Dec 2016
2016-11-16	5d280f2 Browse files » Added registration controller tests, updated reference to Devise's deprectaed 'bypass' with bypass_sign_in', added some test helper to verify redirects to welcome page (for unauthorized attempts) and projects list page (for authorized). Added language_id back to attr_accessible on User model briley committed on 16 Nov 2016
2016-11-16	d41aabb Browse files » Added authentication test and registration controller test. Added troubleshooting info to README. Added generic omniauth id to registration form briley committed on 16 Nov 2016
2016-10-18	991f1a7 Browse files » Merge branch 'master' of https://github.com/DMPRoadmap/roadmap into postgresql Jimmy Angelakos committed on 18 Oct 2016
2016-10-04	0ffb8b7 Browse files » fixed issue with policy check when saving changes to a plans export settings briley committed on 4 Oct 2016
	6dc45db Browse files » Updated export page so that the settings section of each phase's accorordion panel is not an accordion. Its now just a div. briley committed on 4 Oct 2016
	bd292f1 Browse files » removed all instances of comparing booleans to 1 or 0 for postgres compatability xsrust committed on 4 Oct 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-16	3454741 Browse files » fixed merge conflicts with fr and de locale files briley committed on 16 Aug 2016
2016-08-16	cb919e3 Browse files » Fixed issue with link to the terms page in the 'I accept the terms and conditions' link in the sign up section. The link is a part of the locale file, so created a variable called current_locale briley committed on 16 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-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