History for dmpopidor / app / models / user.rb
2017-04-24
@Brian Riley
removed the devise confirmation requirement DMPRoadmap/roadmap#254
Brian Riley committed on 24 Apr 2017
2017-04-18
@briley
removed validate on User.password/email from user model because it conflicts with Devise's validation rules
briley committed on 18 Apr 2017
@briley
added a test that searches for missing translations. Added specific error messages for model validations. Added some devise controlled error messages to pot/po files DMPRoadmap/roadmap#236
briley committed on 18 Apr 2017
2017-04-03
@briley
resolved rebase conflicts from merge with development
briley committed on 3 Apr 2017
2017-03-30
@briley
switched all Perm::CONSTANT to Perm.scope calls. Travis could not handle CONSTANT definitions likely due to rails/ruby evironment. Its better to use scope for queries anyway
briley committed on 30 Mar 2017
@briley
testing switch from constant to scope on perm
briley committed on 30 Mar 2017
@briley
added debug to User perm check
briley committed on 30 Mar 2017
2017-03-27
@Jimmy Angelakos
Administrate (new Super Admin) fixes ...
Jimmy Angelakos committed on 27 Mar 2017
2017-02-24
@Jose Lloret
Fixed merge conflicts
Jose Lloret committed on 24 Feb 2017
2017-02-21
@xsrust
added plans to prefetching for users
xsrust committed on 21 Feb 2017
@xsrust
set user's default scope to prefetch organisation and permissions
xsrust committed on 21 Feb 2017
@xsrust
added constants for all perms in model
xsrust committed on 21 Feb 2017
2017-02-15
@Jose Lloret
URLs without locale param
Jose Lloret committed on 15 Feb 2017
2017-02-08
@briley
removed old Ability model which was used by the CanCan gem. added some more test coverage for Org and User
briley committed on 8 Feb 2017
@briley
removed User.org_type method and updated calls to in on some template views to use the new org.funder? instead
briley committed on 8 Feb 2017
@briley
filled in test coverage gaps. Removed duplicate User.can_grant_api_to_orgs? method
briley committed on 8 Feb 2017
2017-02-07
@briley
commented out organisation getter/setter in user. switched calls to org
briley committed on 7 Feb 2017
@briley
removed references to organisation_id in several models and replaced with .org.id
briley committed on 7 Feb 2017
2017-02-03
@Brian Riley
added a few attributes to Plan and User attr_accessible sections
Brian Riley committed on 3 Feb 2017
@Brian Riley
fixed issue with routes test
Brian Riley committed on 3 Feb 2017
2017-02-02
@Ray Carrick
merge in changes from origin
Ray Carrick committed on 2 Feb 2017
@Ray Carrick
first port of plan creation and editing to new data model
Ray Carrick committed on 2 Feb 2017
2017-02-01
@xsrust
fixed bug with permissions constants
xsrust committed on 1 Feb 2017
2017-01-31
@briley
removed Fileupload object since its not referenced anymore. removed all of the empty test/unit/helpers files
briley committed on 31 Jan 2017
2017-01-26
@briley
started seeds.rb rebuild to work with new schema. Removed guidance_in_group association from guidance. added some attr_accessible attributes
briley committed on 26 Jan 2017
@briley
resolved merge conflicts
briley committed on 26 Jan 2017
2017-01-25
@briley
fixed merge conflicts
briley committed on 25 Jan 2017
@briley
fixed merge conflicts in branding.yml and schema.rb
briley committed on 25 Jan 2017
@xsrust
updated api templates endpoints to use new data access
xsrust committed on 25 Jan 2017
@xsrust
updated additional parts of the admin_phase view to use the new schema's data access. Additionally changed models for suggested_answer, user, guidance_group and question to better reflect the associations in the schema
xsrust committed on 25 Jan 2017