opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / views

2016-09-29	22eb6e7 Browse files » Moved language load from registrations/edit page into the controller. Updated registrations/edit page code to directly create the <select> box rather than using rails helpers which for some reason would not actually select the current language value briley committed on 29 Sep 2016
2016-09-28	9e821f8 Browse files » Fixed bug in yaml files. Updated help page content so that it lists an MIT license briley committed on 28 Sep 2016
	57c9b78 Browse files » updated links and email addresses on the static forms briley committed on 28 Sep 2016
	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-19	5cf9b8c Browse files » allow display of html in question Ray Carrick committed on 19 Sep 2016
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