opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / models / user.rb

2016-11-10	0871968 Browse files » profile save crashing Ray Carrick committed on 10 Nov 2016
2016-11-02	4a4b784 Browse files » fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form. briley committed on 2 Nov 2016
	9616548 Browse files » tidied up new tests and fixtures. Commented out old tests that were failing. Updated relationship between TokenPermissionType and Organisation so that token_permission_type.organisations works briley committed on 2 Nov 2016
	1a7c0b8 Browse files » switched User->Language relationship in Model from has_one to belongs_to briley committed on 2 Nov 2016
2016-11-01	876f315 Browse files » updated user permissions conversion to migrate org_admin details properly xsrust committed on 1 Nov 2016
2016-10-25	563f338 Browse files » modifying relationship between users and organisations \n -users now belong_to organisation \n -organisations now have_many users \n -removed the depricated user_org_roles structure with migration \n -moved data out of that structure into the existing organisation_id field of users to complete relationship \n -re-evaluated functions to do with organisation_id field, as it was used as a placeholder before xsrust committed on 25 Oct 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-07	02876f1 Browse files » updated the update_user_permissions function to make it more performant xsrust committed on 7 Oct 2016
2016-10-06	12dd116 Browse files » added nil check to user model's keep token method briley committed on 6 Oct 2016
2016-10-04	a97e5c7 Browse files » Fixed typos: changed all change_org_detials to change_org_details briley committed on 4 Oct 2016
2016-09-29	345ba0f Browse files » Updated association between User and Organisation to reflect the removed user_org_roles table. Each User now belongs_to an Organisation. briley committed on 29 Sep 2016
2016-09-09	6fa50e7 Browse files » reverted back changes to user<-->org relationship. added missing api and magic strings sections to the other locale files. Brian Riley committed on 9 Sep 2016
2016-09-09	1d88285 Browse files » Revert "Fix to bug in user model that was preventing the organisation association from working (#30)" ... This reverts commit `03941c1`. Brian Riley committed on 9 Sep 2016
2016-09-07	03941c1 Browse files » Fix to bug in user model that was preventing the organisation association from working (#30) ... * 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 * Commented out other deprecated user<-->organisation methods so that they use the user.organisation_id field instead of the user.organisations structure. This needs to be cleaned up and overhauled in the user and organisation models so that user belongs to an organisation and organisations have many users, and any references to the old code need to be updated. Brian Riley authored on 7 Sep 2016 GitHub committed on 7 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	bea115f Browse files » updated efficiency of update_user_permissions xsrust committed on 1 Sep 2016
	978fde6 Browse files » more merge conflicts xsrust committed on 1 Sep 2016
	2fa313f Browse files » overhaul of performance of users admin-index xsrust committed on 1 Sep 2016
	ef563d0 Browse files » added docs to new function xsrust committed on 1 Sep 2016
	05a134b Browse files » finished changes to update_user_permissions xsrust committed on 1 Sep 2016
	80ea00e Browse files » made changed to user.rb xsrust committed on 1 Sep 2016
	0e4b8a3 Browse files » made changes to update user permissions xsrust committed on 1 Sep 2016
	936007d Browse files » added debug to update_user_permissions xsrust committed on 1 Sep 2016
	dac30d4 Browse files » turns out we do user user_org_roles to determine organisation, re-added xsrust committed on 1 Sep 2016
	601a4e4 Browse files » fixed bug in can_<do permission>? functions xsrust committed on 1 Sep 2016
	34ba4b4 Browse files » updated the organisation_id = (new) in user model, was causing seed to fail xsrust committed on 1 Sep 2016
	19abe55 Browse files » updated funciton to ensure no dupelicates xsrust committed on 1 Sep 2016
	1cd8499 Browse files » added functionality to port users from old auth structure to new xsrust committed on 1 Sep 2016
	ad0d0d9 Browse files » ensured users loose roles upon org changing and added depricated tags to roles xsrust committed on 1 Sep 2016
	40d7cdb Browse files » updated documentation syntax for some models xsrust committed on 1 Sep 2016