| 2017-05-08 |
Merge local branch into feature/sso - fixes #39, #276, #287, #290.
...
Jimmy Angelakos
committed
on 8 May 2017
|
|---|---|
| 2017-04-24 |
Fixed issue with current_user.org ref for unaffiliated users. Then fixed issue with timing of plan creator assignment DMPRoadmap/roadmap#257
Brian Riley
committed
on 24 Apr 2017
|
| 2017-04-07 |
broken generic error message handler apart into separate create/update/destroy versions. updated calls within the controllers and fixed tests DMPRoadmap/roadmap#227
Brian Riley
committed
on 7 Apr 2017
|
|
Added obj_name param to the generic error message handler on application_controller. Updated all save error handling to render the page rather than redirect DMPRoadmap/roadmap#227
Brian Riley
committed
on 7 Apr 2017
|
|
| 2017-04-06 |
fixed typos and added some error messaging
briley
committed
on 6 Apr 2017
|
|
fixed merge conflicts after rebase
briley
committed
on 6 Apr 2017
|
|
| 2017-04-03 |
resolved rebase conflicts from merge with development
briley
committed
on 3 Apr 2017
|
|
added error messages to user update profile page and fixed logic bugs
xsrust
committed
on 3 Apr 2017
|
|
| 2017-03-30 |
completes earlier fix of registrations_controller
xsrust
committed
on 30 Mar 2017
|
|
fixed issue with missing attributes in registrations controller. added some debug line for travis issues
briley
committed
on 30 Mar 2017
|
|
|
fixed update user profile bug due to strong parameters
xsrust
committed
on 30 Mar 2017
|
|
| 2017-03-16 |
resolve conflicts from merging Roadmap into DCC
ray.carrick
committed
on 16 Mar 2017
|
|
still need @languages when updating email address
ray.carrick
committed
on 16 Mar 2017
|
|
| 2017-03-03 |
switched registrations controller to user org_id instead of organisation_id. fixes DMPRoadmap/roadmap#145
Brian Riley
committed
on 3 Mar 2017
|
| 2017-02-22 |
removed db call from registrations_controller
Jose Lloret
committed
on 22 Feb 2017
|
| 2017-02-15 |
URLs without locale param
Jose Lloret
committed
on 15 Feb 2017
|
| 2017-01-26 |
resolved merge conflicts
briley
committed
on 26 Jan 2017
|
| 2017-01-10 |
pulled data access out of devise/registrations/edit
xsrust
committed
on 10 Jan 2017
|
|
updated formatting and code style in registrations_controller
xsrust
committed
on 10 Jan 2017
|
|
| 2016-12-08 |
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
|
|
| 2016-12-02 |
Merge pull request #16 from DMPRoadmap/development
...
Brian Riley
authored
on 2 Dec 2016
GitHub
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-21 |
fix double sign-up bug: #69
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
|
|
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
|
|
| 2016-11-10 |
Had to remove code that was building devise omniauth connections dynamically. The timing of when the rails engine builds the routes and the models is not conducive to this approach
briley
committed
on 10 Nov 2016
|
| 2016-11-04 |
Added tests for the new omniauth functionality
Brian Riley
committed
on 4 Nov 2016
|
|
Removed logo from identifier_schemes db table and added it to yaml locales. Added more entries for to the locales for oauth. Added red 'x' removal link for oauths on profile page. updated registrations controller so that users hitting the oauth handler that are not already signed in are brought to a registration page with a new user record that is connected to the oauth identifier
Brian Riley
committed
on 4 Nov 2016
|
|
| 2016-10-24 |
Added a new identifier_schemes table and corresponding user_identifiers join table. Added the initial ORCID identifier scheme to the seeds.db file. Updated the locales file to include corresponding identifier tooltip language, logos, and initial connection message. Updated user profile page to dynamically display identifiers
Brian Riley
committed
on 24 Oct 2016
|