Changeset [87003313185cd20b0f0b0b4faef65c8c7e064d2c] by Daniel O'Connor

January 19th, 2018 @ 12:36 AM

Merge remote-tracking branch 'origin/master' into 0.17.x
https://github.com/fatfreecrm/fat_free_crm/commit/87003313185cd20b0...

Committed by Daniel O'Connor

  • A config/brakeman.ignore
  • R app/assets/javascripts/crm_chosen.js.coffee
  • R app/assets/stylesheets/ffcrm_chosen.scss
  • R vendor/assets/javascripts/ajax-chosen-jquery.js
  • R vendor/assets/javascripts/ajax-chosen.jquery.coffee
  • R vendor/assets/javascripts/chosen-jquery.js
  • R vendor/assets/javascripts/chosen.jquery.coffee
  • R vendor/assets/javascripts/lib/abstract-chosen.coffee
  • R vendor/assets/stylesheets/chosen.css.sass
  • M ".rubocop.yml"
  • M ".rubocop_todo.yml"
  • M ".travis.yml"
  • M Gemfile
  • M Gemfile.lock
  • M app/assets/javascripts/application.js.erb
  • M app/assets/javascripts/crm.js.coffee
  • M app/assets/stylesheets/application.css.erb
  • M app/controllers/admin/fields_controller.rb
  • M app/controllers/application_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/home_controller.rb
  • M app/controllers/users_controller.rb
  • M app/helpers/accounts_helper.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/opportunities_helper.rb
  • M app/helpers/users_helper.rb
  • M app/models/entities/contact.rb
  • M app/models/entities/opportunity.rb
  • M app/models/polymorphic/task.rb
  • M app/views/accounts/_account.html.haml
  • M app/views/accounts/_top_section.html.haml
  • M app/views/admin/field_groups/_top_section.html.haml
  • M app/views/admin/fields/_form.html.haml
  • M app/views/admin/users/_user.html.haml
  • M app/views/application/index.atom.builder
  • M app/views/application/show.atom.builder
  • M app/views/campaigns/_campaign.html.haml
  • M app/views/campaigns/_top_section.html.haml
  • M app/views/contacts/_contact.html.haml
  • M app/views/home/index.atom.builder
  • M app/views/layouts/admin/_header.html.haml
  • M app/views/leads/_convert_permissions.html.haml
  • M app/views/leads/_lead.html.haml
  • M app/views/leads/_opportunity.html.haml
  • M app/views/leads/_status.html.haml
  • M app/views/opportunities/_opportunity.html.haml
  • M app/views/opportunities/_top_section.html.haml
  • M app/views/tasks/_top_section.html.haml
  • M app/views/users/update.js.haml
  • M config/initializers/assets.rb
  • M config/locales/fat_free_crm.en-GB.yml
  • M config/locales/fat_free_crm.en-US.yml
  • M config/locales/fat_free_crm.ja.yml
  • M fat_free_crm.gemspec
  • M lib/fat_free_crm/core_ext/string.rb
  • M lib/fat_free_crm/fields.rb
  • M lib/tasks/ffcrm/setup.rake
  • M spec/controllers/entities/accounts_controller_spec.rb
  • M spec/controllers/entities/campaigns_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/features/accounts_spec.rb
  • M spec/features/admin/groups_spec.rb
  • M spec/features/admin/users_spec.rb
  • M spec/features/contacts_spec.rb
  • M spec/features/leads_spec.rb
  • M spec/features/opportunities_spec.rb
  • M spec/features/support/selector_helpers.rb
  • M spec/features/tasks_spec.rb
  • M spec/helpers/application_helper_spec.rb
  • M spec/models/polymorphic/task_spec.rb
  • M spec/views/accounts/show.haml_spec.rb
  • M spec/views/campaigns/show.haml_spec.rb
  • M spec/views/contacts/show.haml_spec.rb
  • M spec/views/leads/show.haml_spec.rb
  • M spec/views/opportunities/show.haml_spec.rb
  • M vendor/assets/javascripts/textarea_autocomplete.js
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