Changeset [5f173540da831e5ed2e6c0722696ec6e0ed34a76] by Daniel O'Connor
January 9th, 2018 @ 03:50 PM
Merge branch 'master' into fix-659
https://github.com/fatfreecrm/fat_free_crm/commit/5f173540da831e5ed...
Committed by Daniel O'Connor
- M ".rubocop.yml"
- M ".rubocop_todo.yml"
- M ".travis.yml"
- M CHANGELOG.md
- M README.md
- M Vagrantfile
- M app/controllers/admin/users_controller.rb
- M app/controllers/application_controller.rb
- M app/controllers/comments_controller.rb
- M app/controllers/entities/accounts_controller.rb
- M app/controllers/entities/campaigns_controller.rb
- M app/controllers/entities/contacts_controller.rb
- M app/controllers/entities/leads_controller.rb
- M app/controllers/entities/opportunities_controller.rb
- M app/controllers/entities_controller.rb
- M app/controllers/passwords_controller.rb
- M app/controllers/tasks_controller.rb
- M app/controllers/users_controller.rb
- M app/helpers/accounts_helper.rb
- M app/helpers/admin/application_helper.rb
- M app/helpers/application_helper.rb
- M app/helpers/leads_helper.rb
- M app/helpers/opportunities_helper.rb
- M app/models/entities/account.rb
- M app/models/entities/contact.rb
- M app/models/fields/custom_field.rb
- M app/models/fields/field_group.rb
- M app/models/observers/opportunity_observer.rb
- M app/models/polymorphic/version.rb
- M app/models/users/user.rb
- M app/views/accounts/_account.html.haml
- M app/views/accounts/_contact_info.html.haml
- M app/views/accounts/_edit.html.haml
- M app/views/accounts/_index_brief.html.haml
- M app/views/accounts/_index_long.html.haml
- M app/views/accounts/_new.html.haml
- M app/views/accounts/_sidebar_index.html.haml
- M app/views/accounts/_sidebar_show.html.haml
- M app/views/accounts/_title_bar.html.haml
- M app/views/accounts/_top_section.html.haml
- M app/views/accounts/create.js.haml
- M app/views/accounts/destroy.js.haml
- M app/views/accounts/edit.js.haml
- M app/views/accounts/index.js.haml
- M app/views/accounts/new.js.haml
- M app/views/accounts/show.html.haml
- M app/views/accounts/show.js.haml
- M app/views/accounts/update.js.haml
- M app/views/admin/custom_fields/_base_field.html.haml
- M app/views/admin/custom_fields/_check_boxes_field.html.haml
- M app/views/admin/custom_fields/_date_field.html.haml
- M app/views/admin/custom_fields/_date_pair_field.html.haml
- M app/views/admin/custom_fields/_datetime_field.html.haml
- M app/views/admin/custom_fields/_datetime_pair_field.html.haml
- M app/views/admin/custom_fields/_radio_field.html.haml
- M app/views/admin/custom_fields/_select_field.html.haml
- M app/views/admin/custom_fields/_string_field.html.haml
- M app/views/admin/field_groups/_edit.html.haml
- M app/views/admin/field_groups/_field_group.html.haml
- M app/views/admin/field_groups/_new.html.haml
- M app/views/admin/field_groups/_top_section.html.haml
- M app/views/admin/field_groups/confirm.js.haml
- M app/views/admin/field_groups/create.js.haml
- M app/views/admin/field_groups/edit.js.haml
- M app/views/admin/field_groups/new.js.haml
- M app/views/admin/field_groups/update.js.haml
- M app/views/admin/fields/_field.html.haml
- M app/views/admin/fields/_form.html.haml
- M app/views/admin/fields/_subform.html.haml
- M app/views/admin/fields/create.js.haml
- M app/views/admin/fields/edit.js.haml
- M app/views/admin/fields/index.html.haml
- M app/views/admin/fields/show.html.haml
- M app/views/admin/fields/update.js.haml
- M app/views/admin/groups/_edit.html.haml
- M app/views/admin/groups/_form.html.haml
- M app/views/admin/groups/_group.html.haml
- M app/views/admin/groups/_new.html.haml
- M app/views/admin/groups/create.js.haml
- M app/views/admin/groups/edit.js.haml
- M app/views/admin/groups/index.html.haml
- M app/views/admin/groups/index.js.haml
- M app/views/admin/groups/new.js.haml
- M app/views/admin/groups/update.js.haml
- M app/views/admin/plugins/_plugin.html.haml
- M app/views/admin/tags/_confirm.html.haml
- M app/views/admin/tags/_edit.html.haml
- M app/views/admin/tags/_new.html.haml
- M app/views/admin/tags/_tag.html.haml
- M app/views/admin/tags/confirm.js.haml
- M app/views/admin/tags/create.js.haml
- M app/views/admin/tags/edit.js.haml
- M app/views/admin/tags/index.html.haml
- M app/views/admin/tags/new.js.haml
- M app/views/admin/tags/update.js.haml
- M app/views/admin/users/_edit.html.haml
- M app/views/admin/users/_new.html.haml
- M app/views/admin/users/_profile.html.haml
- M app/views/admin/users/_user.html.haml
- M app/views/admin/users/confirm.js.haml
- M app/views/admin/users/create.js.haml
- M app/views/admin/users/edit.js.haml
- M app/views/admin/users/index.html.haml
- M app/views/admin/users/index.js.haml
- M app/views/admin/users/new.js.haml
- M app/views/admin/users/reactivate.js.haml
- M app/views/admin/users/suspend.js.haml
- M app/views/admin/users/update.js.haml
- M app/views/application/_auto_complete.html.haml
- M app/views/authentications/new.html.haml
- M app/views/campaigns/_campaign.html.haml
- M app/views/campaigns/_edit.html.haml
- M app/views/campaigns/_index_brief.html.haml
- M app/views/campaigns/_index_long.html.haml
- M app/views/campaigns/_metrics.html.haml
- M app/views/campaigns/_new.html.haml
- M app/views/campaigns/_objectives.html.haml
- M app/views/campaigns/_sidebar_index.html.haml
- M app/views/campaigns/_sidebar_show.html.haml
- M app/views/campaigns/_status.html.haml
- M app/views/campaigns/_title_bar.html.haml
- M app/views/campaigns/_top_section.html.haml
- M app/views/campaigns/create.js.haml
- M app/views/campaigns/destroy.js.haml
- M app/views/campaigns/edit.js.haml
- M app/views/campaigns/index.js.haml
- M app/views/campaigns/new.js.haml
- M app/views/campaigns/show.html.haml
- M app/views/campaigns/show.js.haml
- M app/views/campaigns/update.js.haml
- M app/views/comments/_comment.html.haml
- M app/views/comments/_edit.html.haml
- M app/views/comments/_new.html.haml
- M app/views/comments/_subscription_links.html.haml
- M app/views/comments/create.js.haml
- M app/views/comments/edit.js.haml
- M app/views/comments/update.js.haml
- M app/views/contacts/_contact.html.haml
- M app/views/contacts/_contacts.html.haml
- M app/views/contacts/_edit.html.haml
- M app/views/contacts/_extra.html.haml
- M app/views/contacts/_index_brief.html.haml
- M app/views/contacts/_index_full.html.haml
- M app/views/contacts/_index_long.html.haml
- M app/views/contacts/_new.html.haml
- M app/views/contacts/_section_extra.html.haml
- M app/views/contacts/_section_general.html.haml
- M app/views/contacts/_sidebar_show.html.haml
- M app/views/contacts/_title_bar.html.haml
- M app/views/contacts/_top_section.html.haml
- M app/views/contacts/create.js.haml
- M app/views/contacts/destroy.js.haml
- M app/views/contacts/edit.js.haml
- M app/views/contacts/index.js.haml
- M app/views/contacts/new.js.haml
- M app/views/contacts/show.html.haml
- M app/views/contacts/show.js.haml
- M app/views/contacts/update.js.haml
- M app/views/emails/_email.html.haml
- M app/views/entities/_basic_search.html.haml
- M app/views/entities/_permissions.html.haml
- M app/views/entities/_search.html.haml
- M app/views/entities/_section_custom_fields.html.haml
- M app/views/entities/_title_bar.html.haml
- M app/views/entities/attach.js.haml
- M app/views/entities/contacts.js.haml
- M app/views/entities/leads.js.haml
- M app/views/entities/opportunities.js.haml
- M app/views/entities/subscription_update.js.haml
- M app/views/entities/versions.js.haml
- M app/views/fields/_edit_custom_field_group.html.haml
- M app/views/fields/_group.html.haml
- M app/views/fields/_group_table.html.haml
- M app/views/fields/_groups.html.haml
- M app/views/fields/_sidebar_show.html.haml
- M app/views/fields/group.js.erb
- M app/views/home/_account.html.haml
- M app/views/home/_activity.html.haml
- M app/views/home/_opportunity.html.haml
- M app/views/home/_options.html.haml
- M app/views/home/_task.html.haml
- M app/views/home/index.html.haml
- M app/views/home/index.js.haml
- M app/views/home/options.js.haml
- M app/views/layouts/500.html.haml
- M app/views/layouts/_footer.html.haml
- M app/views/layouts/_header.html.haml
- M app/views/layouts/_jumpbox.html.haml
- M app/views/layouts/_tabbed.html.haml
- M app/views/layouts/_tabless.html.haml
- M app/views/layouts/admin/_header.html.haml
- M app/views/layouts/admin/application.html.haml
- M app/views/layouts/application.html.haml
- M app/views/leads/_contact.html.haml
- M app/views/leads/_convert.html.haml
- M app/views/leads/_convert_permissions.html.haml
- M app/views/leads/_edit.html.haml
- M app/views/leads/_index_brief.html.haml
- M app/views/leads/_index_long.html.haml
- M app/views/leads/_lead.html.haml
- M app/views/leads/_leads.html.haml
- M app/views/leads/_new.html.haml
- M app/views/leads/_opportunity.html.haml
- M app/views/leads/_sidebar_index.html.haml
- M app/views/leads/_sidebar_show.html.haml
- M app/views/leads/_status.html.haml
- M app/views/leads/_title_bar.html.haml
- M app/views/leads/_top_section.html.haml
- M app/views/leads/convert.js.haml
- M app/views/leads/create.js.haml
- M app/views/leads/destroy.js.haml
- M app/views/leads/edit.js.haml
- M app/views/leads/index.js.haml
- M app/views/leads/new.js.haml
- M app/views/leads/promote.js.haml
- M app/views/leads/reject.js.haml
- M app/views/leads/show.html.haml
- M app/views/leads/show.js.haml
- M app/views/leads/update.js.haml
- M app/views/lists/_lists.html.haml
- M app/views/lists/_sidebar.html.haml
- M app/views/opportunities/_edit.html.haml
- M app/views/opportunities/_index_brief.html.haml
- M app/views/opportunities/_index_long.html.haml
- M app/views/opportunities/_new.html.haml
- M app/views/opportunities/_opportunities.html.haml
- M app/views/opportunities/_opportunity.html.haml
- M app/views/opportunities/_sidebar_index.html.haml
- M app/views/opportunities/_sidebar_show.html.haml
- M app/views/opportunities/_title_bar.html.haml
- M app/views/opportunities/_top_section.html.haml
- M app/views/opportunities/contacts.js.haml
- M app/views/opportunities/create.js.haml
- M app/views/opportunities/destroy.js.haml
- M app/views/opportunities/edit.js.haml
- M app/views/opportunities/index.js.haml
- M app/views/opportunities/new.js.haml
- M app/views/opportunities/show.html.haml
- M app/views/opportunities/show.js.haml
- M app/views/opportunities/update.js.haml
- M app/views/passwords/edit.html.haml
- M app/views/passwords/new.html.haml
- M app/views/shared/_address.html.haml
- M app/views/shared/_comment.html.haml
- M app/views/shared/_edit_comment.html.haml
- M app/views/shared/_empty.html.haml
- M app/views/shared/_paginate_with_per_page.html.haml
- M app/views/shared/_recent.html.haml
- M app/views/shared/_recently.html.haml
- M app/views/shared/_search.html.haml
- M app/views/shared/_tags.html.haml
- M app/views/shared/_tasks.html.haml
- M app/views/subscription_mailer/comment_notification.text.erb
- M app/views/tasks/_assigned.html.haml
- M app/views/tasks/_completed.html.haml
- M app/views/tasks/_edit.html.haml
- M app/views/tasks/_empty.html.haml
- M app/views/tasks/_new.html.haml
- M app/views/tasks/_pending.html.haml
- M app/views/tasks/_related.html.haml
- M app/views/tasks/_selector.html.haml
- M app/views/tasks/_sidebar_index.html.haml
- M app/views/tasks/_title.html.haml
- M app/views/tasks/_top_section.html.haml
- M app/views/tasks/complete.js.haml
- M app/views/tasks/create.js.haml
- M app/views/tasks/edit.js.haml
- M app/views/tasks/index.html.haml
- M app/views/tasks/new.js.haml
- M app/views/tasks/update.js.haml
- M app/views/users/_avatar.html.haml
- M app/views/users/_password.html.haml
- M app/views/users/_profile.html.haml
- M app/views/users/_user.html.haml
- M app/views/users/_user_report.html.haml
- M app/views/users/avatar.js.haml
- M app/views/users/change_password.js.haml
- M app/views/users/edit.js.haml
- M app/views/users/new.html.haml
- M app/views/users/opportunities_overview.html.haml
- M app/views/users/password.js.haml
- M app/views/users/show.html.haml
- M app/views/users/update.js.haml
- M app/views/users/upload_avatar.js.haml
- M app/views/versions/_version.html.haml
- M app/views/versions/_version_item.html.haml
- M app/views/versions/_versions.html.haml
- M bin/rails
- M config.ru
- M config/initializers/views.rb
- M config/routes.rb
- M db/migrate/20100928030599_create_users.rb
- M db/migrate/20100928030600_create_openid_tables.rb
- M db/migrate/20100928030602_create_permissions.rb
- M db/migrate/20100928030605_create_campaigns.rb
- M db/migrate/20100928030606_create_leads.rb
- M db/migrate/20100928030607_create_contacts.rb
- M db/migrate/20100928030608_create_opportunities.rb
- M db/migrate/20100928030613_create_comments.rb
- M db/migrate/20100928030614_create_activities.rb
- M db/migrate/20100928030615_create_avatars.rb
- M db/migrate/20100928030617_drop_openid_tables.rb
- M db/migrate/20100928030625_create_emails.rb
- M db/migrate/20120216031616_create_versions.rb
- M db/migrate/20180102075234_add_account_counter_caches.rb
- M db/migrate/20180103223438_add_minlength_to_field.rb
- M fat_free_crm.gemspec
- M lib/fat_free_crm/core_ext/alias_method_chain.rb
- M lib/fat_free_crm/core_ext/string.rb
- M lib/fat_free_crm/gem_ext/rails/engine.rb
- M lib/fat_free_crm/mail_processor/base.rb
- M lib/fat_free_crm/mail_processor/dropbox.rb
- M lib/fat_free_crm/permissions.rb
- M lib/tasks/ffcrm/demo.rake
- M lib/tasks/ffcrm/update_data.rake
- M script/rails
- M spec/controllers/admin/users_controller_spec.rb
- M spec/controllers/comments_controller_spec.rb
- M spec/controllers/emails_controller_spec.rb
- M spec/controllers/entities/accounts_controller_spec.rb
- M spec/controllers/entities/campaigns_controller_spec.rb
- M spec/controllers/entities/contacts_controller_spec.rb
- M spec/controllers/entities/leads_controller_spec.rb
- M spec/controllers/entities/opportunities_controller_spec.rb
- M spec/controllers/home_controller_spec.rb
- M spec/controllers/tasks_controller_spec.rb
- M spec/controllers/users_controller_spec.rb
- M spec/factories/sequences.rb
- M spec/factories/shared_factories.rb
- M spec/factories/user_factories.rb
- M spec/features/accounts_spec.rb
- M spec/features/admin/groups_spec.rb
- M spec/features/admin/users_spec.rb
- M spec/features/campaigns_spec.rb
- M spec/features/contacts_spec.rb
- M spec/features/dashboard_spec.rb
- M spec/features/leads_spec.rb
- M spec/features/opportunities_overview_spec.rb
- M spec/features/opportunities_spec.rb
- M spec/features/tasks_spec.rb
- M spec/helpers/application_helper_spec.rb
- M spec/lib/mail_processor/sample_emails/dropbox.rb
- M spec/models/entities/account_spec.rb
- M spec/models/entities/campaign_spec.rb
- M spec/models/entities/contact_spec.rb
- M spec/models/entities/lead_spec.rb
- M spec/models/entities/opportunity_spec.rb
- M spec/models/fields/field_spec.rb
- M spec/models/polymorphic/address_spec.rb
- M spec/models/polymorphic/comment_spec.rb
- M spec/models/polymorphic/task_spec.rb
- M spec/models/polymorphic/version_spec.rb
- M spec/models/users/user_spec.rb
- M spec/support/auth_macros.rb
- M spec/views/accounts/_edit.haml_spec.rb
- M spec/views/accounts/_new.haml_spec.rb
- M spec/views/accounts/create.js.haml_spec.rb
- M spec/views/accounts/destroy.js.haml_spec.rb
- M spec/views/accounts/edit.js.haml_spec.rb
- M spec/views/accounts/index.haml_spec.rb
- M spec/views/accounts/index.js.haml_spec.rb
- M spec/views/accounts/new.js.haml_spec.rb
- M spec/views/accounts/show.haml_spec.rb
- M spec/views/accounts/update.js.haml_spec.rb
- M spec/views/admin/field_groups/create.js.haml_spec.rb
- M spec/views/admin/field_groups/destroy.js.haml_spec.rb
- M spec/views/admin/field_groups/edit.js.haml_spec.rb
- M spec/views/admin/field_groups/new.js.haml_spec.rb
- M spec/views/admin/field_groups/update.js.haml_spec.rb
- M spec/views/admin/users/_create.haml_spec.rb
- M spec/views/admin/users/create.js.haml_spec.rb
- M spec/views/admin/users/destroy.js.haml_spec.rb
- M spec/views/admin/users/edit.js.haml_spec.rb
- M spec/views/admin/users/index.haml_spec.rb
- M spec/views/admin/users/index.js.haml_spec.rb
- M spec/views/admin/users/new.js.haml_spec.rb
- M spec/views/admin/users/reactivate.js.haml_spec.rb
- M spec/views/admin/users/suspend.js.haml_spec.rb
- M spec/views/admin/users/update.js.haml_spec.rb
- M spec/views/application/auto_complete.haml_spec.rb
- M spec/views/campaigns/_edit.haml_spec.rb
- M spec/views/campaigns/_new.haml_spec.rb
- M spec/views/campaigns/create.js.haml_spec.rb
- M spec/views/campaigns/destroy.js.haml_spec.rb
- M spec/views/campaigns/edit.js.haml_spec.rb
- M spec/views/campaigns/index.haml_spec.rb
- M spec/views/campaigns/index.js.haml_spec.rb
- M spec/views/campaigns/new.js.haml_spec.rb
- M spec/views/campaigns/show.haml_spec.rb
- M spec/views/campaigns/update.js.haml_spec.rb
- M spec/views/comments/edit.js.haml_spec.rb
- M spec/views/contacts/_edit.haml_spec.rb
- M spec/views/contacts/_new.haml_spec.rb
- M spec/views/contacts/create.js.haml_spec.rb
- M spec/views/contacts/destroy.js.haml_spec.rb
- M spec/views/contacts/edit.js.haml_spec.rb
- M spec/views/contacts/index.haml_spec.rb
- M spec/views/contacts/index.js.html_spec.rb
- M spec/views/contacts/new.js.haml_spec.rb
- M spec/views/contacts/show.haml_spec.rb
- M spec/views/contacts/update.js.haml_spec.rb
- M spec/views/home/index.haml_spec.rb
- M spec/views/home/index.js.haml_spec.rb
- M spec/views/home/options.js.haml_spec.rb
- M spec/views/leads/_convert.haml_spec.rb
- M spec/views/leads/_edit.haml_spec.rb
- M spec/views/leads/_new.haml_spec.rb
- M spec/views/leads/_sidebar_show.haml_spec.rb
- M spec/views/leads/convert.js.haml_spec.rb
- M spec/views/leads/create.js.haml_spec.rb
- M spec/views/leads/destroy.js.haml_spec.rb
- M spec/views/leads/edit.js.haml_spec.rb
- M spec/views/leads/index.haml_spec.rb
- M spec/views/leads/index.js.haml_spec.rb
- M spec/views/leads/new.js.haml_spec.rb
- M spec/views/leads/promote.js.haml_spec.rb
- M spec/views/leads/reject.js.haml_spec.rb
- M spec/views/leads/show.haml_spec.rb
- M spec/views/leads/update.js.haml_spec.rb
- M spec/views/opportunities/_edit.haml_spec.rb
- M spec/views/opportunities/_new.haml_spec.rb
- M spec/views/opportunities/create.js.haml_spec.rb
- M spec/views/opportunities/destroy.js.haml_spec.rb
- M spec/views/opportunities/edit.js.haml_spec.rb
- M spec/views/opportunities/index.haml_spec.rb
- M spec/views/opportunities/index.js.haml_spec.rb
- M spec/views/opportunities/new.js.haml_spec.rb
- M spec/views/opportunities/show.haml_spec.rb
- M spec/views/opportunities/update.js.haml_spec.rb
- M spec/views/tasks/_edit.haml_spec.rb
- M spec/views/tasks/complete.js.haml_spec.rb
- M spec/views/tasks/create.js.haml_spec.rb
- M spec/views/tasks/destroy.js.haml_spec.rb
- M spec/views/tasks/edit.js.haml_spec.rb
- M spec/views/tasks/index.haml_spec.rb
- M spec/views/tasks/new.js.haml_spec.rb
- M spec/views/tasks/uncomplete.js.haml_spec.rb
- M spec/views/tasks/update.js.haml_spec.rb
- M spec/views/users/avatar.js.haml_spec.rb
- M spec/views/users/change_password.js.haml_spec.rb
- M spec/views/users/edit.js.haml_spec.rb
- M spec/views/users/password.js.haml_spec.rb
- M spec/views/users/update.js.haml_spec.rb
- M spec/views/users/upload_avatar.js.haml_spec.rb
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Ruby on Rails CRM platform for Web 2.0 and beyond