Changeset [309f6aebc08639a1573b40bca6c84cfc55de88e5] by Daniel O'Connor
January 31st, 2017 @ 07:21 PM
Merge branch 'master' into rails5
https://github.com/fatfreecrm/fat_free_crm/commit/309f6aebc08639a15...
Committed by Daniel O'Connor
- A ".rubocop_todo.yml"
- A CHANGELOG.md
- A app/assets/stylesheets/about.css.scss
- A config/initializers/paper_trail.rb
- A config/locales/es-CL.yml
- A config/locales/es-CL_fat_free_crm.yml
- A config/locales/es-CL_ransack.yml
- A config/locales/es_ransack.yml
- A config/locales/nl.yml
- A config/locales/nl_fat_free_crm.yml
- A config/locales/nl_ransack.yml
- A db/migrate/20160511053730_add_account_contacts_index.rb
- A vendor/assets/javascripts/jquery_timeago/jquery.timeago.es-CL.js
- A vendor/assets/javascripts/jquery_timeago/jquery.timeago.nl.js
- A vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-es-CL.js
- A vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-es-CL.js
- A vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-nl.js
- A vendor/gems/globby-0.1.2/LICENSE.txt
- A vendor/gems/globby-0.1.2/README.md
- A vendor/gems/globby-0.1.2/Rakefile
- A vendor/gems/globby-0.1.2/lib/globby.rb
- A vendor/gems/globby-0.1.2/lib/globby/glob.rb
- A vendor/gems/globby-0.1.2/lib/globby/globject.rb
- A vendor/gems/globby-0.1.2/lib/globby/result.rb
- A vendor/gems/globby-0.1.2/spec/gitignore_spec.rb
- A vendor/gems/globby-0.1.2/spec/globby_spec.rb
- R CHANGELOG
- R Gemfile.ci
- M ".rspec"
- M ".rubocop.yml"
- M ".travis.yml"
- M Gemfile
- M Gemfile.lock
- M README.md
- M app/assets/javascripts/search.js.coffee
- M app/assets/stylesheets/application.css.erb
- M app/controllers/admin/users_controller.rb
- M app/controllers/application_controller.rb
- M app/controllers/comments_controller.rb
- M app/controllers/entities/contacts_controller.rb
- M app/controllers/entities/opportunities_controller.rb
- M app/controllers/entities_controller.rb
- M app/controllers/passwords_controller.rb
- M app/controllers/users_controller.rb
- M app/helpers/accounts_helper.rb
- M app/helpers/application_helper.rb
- M app/helpers/campaigns_helper.rb
- M app/helpers/opportunities_helper.rb
- M app/helpers/tasks_helper.rb
- M app/helpers/versions_helper.rb
- M app/inputs/date_pair_input.rb
- M app/inputs/date_time_input.rb
- M app/models/entities/contact.rb
- M app/models/entities/lead.rb
- M app/models/entities/opportunity.rb
- M app/models/fields/field.rb
- M app/models/polymorphic/address.rb
- M app/models/polymorphic/comment.rb
- M app/models/polymorphic/task.rb
- M app/models/polymorphic/version.rb
- M app/models/setting.rb
- M app/models/users/authentication.rb
- M app/models/users/user.rb
- M app/views/layouts/_about.html.haml
- M app/views/users/_user.html.haml
- M config/environments/test.rb
- M config/initializers/assets.rb
- M config/initializers/simple_form.rb
- M config/initializers/views.rb
- M config/locales/es.yml
- M config/locales/es_fat_free_crm.yml
- M config/locales/ru_fat_free_crm.yml
- M config/locales/th.rb
- M config/unicorn.rb
- M db/migrate/20100928030620_remove_uuid.rb
- M db/migrate/20111201030535_add_field_groups_klass_name.rb
- M db/migrate/20120224073107_remove_default_value_and_clear_settings.rb
- M db/schema.rb
- M fat_free_crm.gemspec
- M lib/development_tasks/rspec.rake
- M lib/fat_free_crm.rb
- M lib/fat_free_crm/callback.rb
- M lib/fat_free_crm/core_ext/string.rb
- M lib/fat_free_crm/engine.rb
- M lib/fat_free_crm/fields.rb
- M lib/fat_free_crm/i18n.rb
- M lib/fat_free_crm/mail_processor/base.rb
- M lib/fat_free_crm/mail_processor/comment_replies.rb
- M lib/fat_free_crm/permissions.rb
- M lib/fat_free_crm/version.rb
- M lib/gravatar_image_tag.rb
- M lib/tasks/ffcrm/config.rake
- M lib/tasks/ffcrm/setup.rake
- M lib/tasks/ffcrm/update_data.rake
- M spec/controllers/tasks_controller_spec.rb
- M spec/factories/field_factories.rb
- M spec/factories/opportunity_factories.rb
- M spec/factories/shared_factories.rb
- M spec/factories/user_factories.rb
- M spec/mailers/subscription_mailer_spec.rb
- M spec/mailers/user_mailer_spec.rb
- M spec/models/entities/opportunity_spec.rb
- M spec/models/fields/custom_field_pair_spec.rb
- M spec/models/setting_spec.rb
- M spec/models/users/abilities/user_ability_spec.rb
- M spec/models/users/user_spec.rb
- M spec/shared/controllers.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/update.js.haml_spec.rb
- M spec/views/admin/field_groups/create.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/_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/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/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/uncomplete.js.haml_spec.rb
- M spec/views/tasks/update.js.haml_spec.rb
- M spec/views/users/upload_avatar.js.haml_spec.rb
- M vendor/assets/javascripts/jquery_timeago/index.js
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