Changeset [f22446503506a4bf4501d83857e54d55b43de03f] by Johnny Shields

January 20th, 2018 @ 04:58 AM

Merge branch 'master' into fix-679-leads-to-accounts
https://github.com/fatfreecrm/fat_free_crm/commit/f22446503506a4bf4...

Committed by Johnny Shields

  • M CHANGELOG.md
  • M Gemfile
  • M Gemfile.lock
  • M lib/fat_free_crm/engine.rb
  • M spec/controllers/admin/users_controller_spec.rb
  • M spec/controllers/authentications_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/passwords_controller_spec.rb
  • M spec/controllers/tasks_controller_spec.rb
  • M spec/controllers/users_controller_spec.rb
  • M spec/factories/account_factories.rb
  • M spec/factories/campaign_factories.rb
  • M spec/factories/contact_factories.rb
  • M spec/factories/field_factories.rb
  • M spec/factories/lead_factories.rb
  • M spec/factories/list_factories.rb
  • M spec/factories/opportunity_factories.rb
  • M spec/factories/sequences.rb
  • M spec/factories/setting_factories.rb
  • M spec/factories/shared_factories.rb
  • M spec/factories/subscription_factories.rb
  • M spec/factories/tag_factories.rb
  • M spec/factories/task_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/support/helpers.rb
  • M spec/features/tasks_spec.rb
  • M spec/helpers/admin/field_groups_helper_spec.rb
  • M spec/helpers/application_helper_spec.rb
  • M spec/helpers/tasks_helper_spec.rb
  • M spec/helpers/users_helper_spec.rb
  • M spec/lib/comment_extensions_spec.rb
  • M spec/lib/mail_processor/base_spec.rb
  • M spec/lib/mail_processor/comment_replies_spec.rb
  • M spec/lib/mail_processor/dropbox_spec.rb
  • M spec/lib/permissions_spec.rb
  • M spec/mailers/user_mailer_spec.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/custom_field_spec.rb
  • M spec/models/list_spec.rb
  • M spec/models/observers/entity_observer_spec.rb
  • M spec/models/polymorphic/address_spec.rb
  • M spec/models/polymorphic/avatar_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/setting_spec.rb
  • M spec/models/users/preference_spec.rb
  • M spec/models/users/user_spec.rb
  • M spec/shared/models.rb
  • M spec/spec_helper.rb
  • M spec/support/auth_macros.rb
  • M spec/support/macros.rb
  • M spec/views/accounts/_edit.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/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.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/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/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/show.haml_spec.rb
  • M spec/views/campaigns/update.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/create.js.haml_spec.rb
  • M spec/views/leads/new.js.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/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/upload_avatar.js.haml_spec.rb
New-ticket Create new ticket

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