Changeset [14f6e05e0c1c8f7b15daec8d82aa1962fa0efadd] by Daniel O'Connor

January 6th, 2018 @ 10:32 PM

Merge branch 'master' into devise-simplify-specs
https://github.com/fatfreecrm/fat_free_crm/commit/14f6e05e0c1c8f7b1...

Committed by Daniel O'Connor

  • A db/migrate/20180103223438_add_minlength_to_field.rb
  • M ".travis.yml"
  • 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/lists_controller.rb
  • M app/controllers/tasks_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/mailers/subscription_mailer.rb
  • M app/mailers/user_mailer.rb
  • M app/models/entities/account.rb
  • M app/models/entities/campaign.rb
  • M app/models/entities/contact.rb
  • M app/models/entities/lead.rb
  • M app/models/entities/opportunity.rb
  • M app/models/fields/core_field.rb
  • M app/models/fields/custom_field.rb
  • M app/models/fields/field.rb
  • M app/models/polymorphic/task.rb
  • M app/models/setting.rb
  • M app/models/users/user.rb
  • M app/views/accounts/index.xls.builder
  • M app/views/admin/custom_fields/_base_field.html.haml
  • M app/views/application/index.atom.builder
  • M app/views/application/show.atom.builder
  • M app/views/application/show.rss.builder
  • M app/views/campaigns/index.xls.builder
  • M app/views/contacts/index.xls.builder
  • M app/views/home/index.atom.builder
  • M app/views/leads/index.xls.builder
  • M app/views/opportunities/index.xls.builder
  • M app/views/shared/_empty.html.haml
  • M app/views/tasks/index.xls.builder
  • M config/locales/fat_free_crm.de.yml
  • M config/locales/fat_free_crm.en-GB.yml
  • M config/locales/fat_free_crm.en-US.yml
  • M config/locales/fat_free_crm.es-CL.yml
  • M config/locales/fat_free_crm.es.yml
  • M config/locales/fat_free_crm.fr.yml
  • M config/locales/fat_free_crm.nl.yml
  • M config/locales/fat_free_crm.pt-BR.yml
  • M config/locales/fat_free_crm.ru.yml
  • M db/migrate/20120316045804_activities_to_versions.rb
  • M db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb
  • M db/schema.rb
  • M lib/fat_free_crm/core_ext/alias_method_chain.rb
  • M lib/fat_free_crm/permissions.rb
  • M lib/tasks/ffcrm/missing_translations.rake
  • M spec/mailers/subscription_mailer_spec.rb
  • M spec/models/fields/field_spec.rb
  • M spec/models/setting_spec.rb
  • M spec/models/users/user_spec.rb
  • M spec/spec_helper.rb
  • M spec/support/macros.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