no changes to settings but added modules to gitignore
resolving merge conflicts
Merge branch 'development' of https://github.com/RCPL/RCPL-Drupal-7 into development
Merge branch 'development' of https://github.com/RCPL/RCPL-Drupal-7 into styling-changes
Sets LibAnswers "department id" as 930 which is the only "department" that we currently have chatting. Effectively removes dropdown.
Allows LibAnswers to have a default department id set.
Adds hook_mail_alter to redirect emails being sent from the system to @myrcpl.com to go to @richlandlibrary.com.
styling changes to bento boxes
#77038760: Adds events, clubs & orgs, and user search views into Custom Views feature module for safe-keeping. Modifies clubs and orgs to be searchable and have an alpha pager on it.
#77038760: Set the filters to expand if already selected.
#77038760: Adds reset button to Clubs & Orgs. view.
#77038760: Removes "remember" setting from Clubs & Orgs filters.
resolving conflicts between branches
Merge branch 'development' of https://github.com/RCPL/RCPL-Drupal-7 into styling-changes
Merge branch 'development' of https://github.com/RCPL/RCPL-Drupal-7 into development
changes to settings file
Merge branch 'styling-changes' into development
Revert of changes to .gitignore and settings file.
Revert of changes to settings file.
Adds Polaris API info back to settings.php.