GitBucket
| 2016-12-12 |
updated roles test fixture to use the modified magic string name
briley
committed
on 12 Dec 2016
|
|---|---|
|
Added magic strings and identifier schemes to new ES locale file. Updated names of magic string categories so that they match the table names
briley
committed
on 12 Dec 2016
|
|
| 2016-12-08 |
fixed bug in new config test
briley
committed
on 8 Dec 2016
|
|
moved devise config checks to a test
briley
committed
on 8 Dec 2016
|
|
|
Removed devise/identifier scheme comparison from environment.rb. Cannot run data migrations with it in place because it references the IdentifierScheme model but the table has not yet been defined
briley
committed
on 8 Dec 2016
|
|
|
Merge branch 'development' of https://github.com/CDLUC3/roadmap into development
briley
committed
on 8 Dec 2016
|
|
|
fixed issue with the oauth hash in the registrations controller
briley
committed
on 8 Dec 2016
|
|
|
finished application_helper tests
briley
committed
on 8 Dec 2016
|
|
|
renamed hash_to_json_object in application_helper to hash_to_js_json_variable to make its purpose clearer
briley
committed
on 8 Dec 2016
|
|
|
removed unused link_to_function and link_to_add_object methods from application_helper
briley
committed
on 8 Dec 2016
|
|
|
added initial application_helper tests
briley
committed
on 8 Dec 2016
|
|
|
added simplecov gem for testing to provide us with a test coverage report. Added a test for application_helper.rb. Removed tab characters from application_helper.rb and added some lines to help with readability
briley
committed
on 8 Dec 2016
|
|
| 2016-12-02 |
Merge pull request #16 from DMPRoadmap/development
...
Brian Riley
authored
on 2 Dec 2016
GitHub
committed
on 2 Dec 2016
|
fixed typo in fr.yml locale file that was introduced while resolving merge conflicts
Brian Riley
committed
on 2 Dec 2016
|
|
|
Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.
Brian Riley
committed
on 2 Dec 2016
|
|
| 2016-11-29 |
added a initialization helper to assist with omniauth provider registration. Added a remove.png image for disconnecting providers from user accounts
briley
committed
on 29 Nov 2016
|
| 2016-11-28 |
Merge pull request #71 from DigitalCurationCentre/master
...
Brian Riley
authored
on 28 Nov 2016
GitHub
committed
on 28 Nov 2016
|
| 2016-11-23 |
Merge branch 'postgresql'
Ray Carrick
committed
on 23 Nov 2016
|
|
Merge branch 'reinstate_branding' into postgresql
Ray Carrick
committed
on 23 Nov 2016
|
|
|
reinstate branding.yml
Ray Carrick
committed
on 23 Nov 2016
|
|
| 2016-11-22 |
Merge branch 'reset_password_link' into postgresql
Ray Carrick
committed
on 22 Nov 2016
|
|
add a reset_password_link method for convenience
Ray Carrick
committed
on 22 Nov 2016
|
|
| 2016-11-21 |
Merge pull request #11 from DigitalCurationCentre/postgresql
...
Ray Carrick
authored
on 21 Nov 2016
GitHub
committed
on 21 Nov 2016
|
Merge branch 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql
Ruby Rails Dev Account
committed
on 21 Nov 2016
|
|
|
Merge branch 'double_sign_up' into postgresql
Ruby Rails Dev Account
committed
on 21 Nov 2016
|
|
|
fix double sign-up bug: #69
Ruby Rails Dev Account
committed
on 21 Nov 2016
|
|
|
Merge branch 'link_fixes' into postgresql
Ruby Rails Dev Account
committed
on 21 Nov 2016
|
|
|
get rid of explcit urls in admin/superadmin links
Ruby Rails Dev Account
committed
on 21 Nov 2016
|
|
| 2016-11-16 |
fixed nil check bug in registrations controller
briley
committed
on 16 Nov 2016
|
|
Moved org specific telephone, address and google maps link to config/branding.yml
briley
committed
on 16 Nov 2016
|