GitBucket
| 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
|
|
|
moved orcid and remove images to lib
briley
committed
on 16 Nov 2016
|
|
|
fixed authentication integration test. updated test_helper to compensate for Devise sometimes having an intermediate redirect
briley
committed
on 16 Nov 2016
|
|
|
Added registration controller tests, updated reference to Devise's deprectaed 'bypass' with bypass_sign_in', added some test helper to verify redirects to welcome page (for unauthorized attempts) and projects list page (for authorized). Added language_id back to attr_accessible on User model
briley
committed
on 16 Nov 2016
|
|
|
Added registration controller tests, updated reference to Devise's deprectaed 'bypass' with bypass_sign_in', added some test helper to verify redirects to welcome page (for unauthorized attempts) and projects list page (for authorized). Added language_id back to attr_accessible on User model
briley
committed
on 16 Nov 2016
|
|
|
Added authentication test and registration controller test. Added troubleshooting info to README. Added generic omniauth id to registration form
briley
committed
on 16 Nov 2016
|
|
| 2016-11-15 |
Merge branch 'migrate_version_published' into postgresql
Ruby Rails Dev Account
committed
on 15 Nov 2016
|
|
expand migration to work with pg
Ruby Rails Dev Account
committed
on 15 Nov 2016
|
|
| 2016-11-14 |
Merge branch 'text_changes' into postgresql
Ruby Rails Dev Account
committed
on 14 Nov 2016
|
|
text changes requested by Sarah 2016/11/14
Ruby Rails Dev Account
committed
on 14 Nov 2016
|
|
|
Merge branch 'add_spanish' into postgresql
Ray Carrick
committed
on 14 Nov 2016
|
|
|
add spanish translations
Ray Carrick
committed
on 14 Nov 2016
|
|
| 2016-11-11 |
Merge branch 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql
Ray Carrick
committed
on 11 Nov 2016
|
|
Merge branch 'add_new_fr' into postgresql
Ray Carrick
committed
on 11 Nov 2016
|
|
|
add new french translations
Ray Carrick
committed
on 11 Nov 2016
|
|
|
Merge branch 'optional_about_tab' into postgresql
Ruby Rails Dev Account
committed
on 11 Nov 2016
|
|
|
if no title for news tab miss it out
Ruby Rails Dev Account
committed
on 11 Nov 2016
|