opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / views

2016-09-08	97a60aa Browse files » Removal of ajax calls from the Create Plan page (#31) Brian Riley authored on 8 Sep 2016 GitHub committed on 8 Sep 2016
2016-09-06	82cfee1 Browse files » Commented out deprecated user.organisation_id method (#29) ... * updated dragonfly max logo height/width to 160px to fit with current max size of DMPRoadmap logo * 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. * commented out legacy user.organisation_id method in user model. Each user now belongs to one organisation Brian Riley authored on 6 Sep 2016 GitHub committed on 6 Sep 2016
2016-09-01	c420402 Browse files » Fixed bug in logo branding view briley committed on 1 Sep 2016
	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
	978fde6 Browse files » more merge conflicts xsrust committed on 1 Sep 2016
	8e5faeb Browse files » added ability to grant permissions to other users xsrust committed on 1 Sep 2016
	ddc278e Browse files » fixed a bug where users' api_tokens would display if they had none xsrust committed on 1 Sep 2016
	2fa313f Browse files » overhaul of performance of users admin-index xsrust committed on 1 Sep 2016
	ad3dd26 Browse files » implimenting auth changes in the views xsrust committed on 1 Sep 2016
	4c35911 Browse files » fixed merge conflicts xsrust committed on 1 Sep 2016
	3f70102 Browse files » added ability to grant permissions to other users xsrust committed on 1 Sep 2016
	9decd20 Browse files » fixed a bug where users' api_tokens would display if they had none xsrust committed on 1 Sep 2016
	102ff66 Browse files » overhaul of performance of users admin-index 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-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
2016-08-22	1ff27cf Browse files » implimenting auth changes in the views xsrust committed on 22 Aug 2016
2016-08-18	4a47449 Browse files » Merge pull request #4 from raycarrick-ed/master ... bullet lists for questions raycarrick-ed authored on 18 Aug 2016 GitHub committed on 18 Aug 2016
	32a42f8 Browse files » explicit bullet style for questions and raw questoin test in form Ray Carrick committed on 18 Aug 2016
	99f9f6f Browse files » removed depricated controller 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-16	91b840f Browse files » fixed merge conflicts in Gemfile and Schema.rb briley committed on 16 Aug 2016
	3454741 Browse files » fixed merge conflicts with fr and de locale files briley committed on 16 Aug 2016
	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-15	8b0735c Browse files » change how questions are displayed in plans to honour formatting Ray Carrick committed on 15 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
2016-08-11	d191694 Browse files » allow org admin to upload logo through admin UI Weiwei Shi committed on 11 Aug 2016
2016-08-11	3974321 Browse files » Merge branch 'development' of https://github.com/DMPRoadmap/roadmap ... Lots of merge conflicts so I had to go through and manually fix them Hopefully have not missed any conflicts nor destroyed any work done by somebody Most of the conflicts were on account of changes to branding in files, but others were content changed on both forks New Gem requires ruby 2.2.2 (contact_us) xsrust committed on 11 Aug 2016