dmpopidor / lib /
@Brian Riley Brian Riley authored on 2 Dec 2016
..
assets 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. 9 years ago
tasks Corrected spelling of text_desription field in token_permission_types 9 years ago
templates/erb/ scaffold Merging master (#20) 9 years ago
active_admin_views_pages_base.rb Merging master (#20) 9 years ago
custom_failure.rb reverted changes to devise that were attempting to redirect users to the login page after session expiration. It was causing occassional sign_in issues due to a redirect loop 9 years ago
global_helpers.rb Merging master (#20) 9 years ago