Changeset [95a1d7cf885cdf4adaa3bc26c92c6ba724502b99] by Daniel O'Connor
December 13th, 2017 @ 09:28 PM
Merge branch 'master' into bundle-update-2017-12-14-120923
https://github.com/fatfreecrm/fat_free_crm/commit/95a1d7cf885cdf4ad...
Committed by Daniel O'Connor
- M Gemfile
- M Gemfile.lock
- M app/controllers/admin/fields_controller.rb
- M app/controllers/admin/groups_controller.rb
- M app/controllers/admin/tags_controller.rb
- M app/controllers/admin/users_controller.rb
- M app/controllers/application_controller.rb
- M app/controllers/authentications_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/home_controller.rb
- M app/controllers/passwords_controller.rb
- M app/controllers/tasks_controller.rb
- M app/controllers/users_controller.rb
- M app/helpers/application_helper.rb
- M app/helpers/opportunities_helper.rb
- M app/inputs/date_pair_input.rb
- M app/models/entities/account.rb
- M app/models/entities/account_contact.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/custom_field.rb
- M app/models/fields/custom_field_pair.rb
- M app/models/fields/field.rb
- M app/models/polymorphic/address.rb
- M app/models/polymorphic/avatar.rb
- M app/models/polymorphic/task.rb
- M app/models/polymorphic/version.rb
- M app/models/users/ability.rb
- M app/models/users/user.rb
- M app/views/accounts/index.js.haml
- M app/views/campaigns/index.js.haml
- M app/views/contacts/index.js.haml
- M app/views/leads/index.js.haml
- M app/views/opportunities/index.js.haml
- M config/application.rb
- M config/boot.rb
- M config/deploy.example.rb
- M config/initializers/assets.rb
- M config/initializers/constants.rb
- M config/initializers/ransack.rb
- M config/routes.rb
- M db/migrate/20100928030598_create_sessions.rb
- M db/migrate/20100928030599_create_users.rb
- M db/migrate/20100928030600_create_openid_tables.rb
- M db/migrate/20100928030601_create_accounts.rb
- M db/migrate/20100928030602_create_permissions.rb
- M db/migrate/20100928030603_create_settings.rb
- M db/migrate/20100928030604_create_preferences.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/20100928030609_create_account_contacts.rb
- M db/migrate/20100928030610_create_account_opportunities.rb
- M db/migrate/20100928030611_create_contact_opportunities.rb
- M db/migrate/20100928030612_create_tasks.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/20100928030616_rename_remember_token.rb
- M db/migrate/20100928030617_drop_openid_tables.rb
- M db/migrate/20100928030618_add_admin_to_users.rb
- M db/migrate/20100928030619_add_suspended_to_users.rb
- M db/migrate/20100928030620_remove_uuid.rb
- M db/migrate/20100928030621_add_email_to_accounts.rb
- M db/migrate/20100928030622_add_background_info_to_models.rb
- M db/migrate/20100928030623_create_addresses.rb
- M db/migrate/20100928030624_add_index_on_permissions.rb
- M db/migrate/20100928030625_create_emails.rb
- M db/migrate/20100928030626_add_state_to_timeline_objects.rb
- M db/migrate/20100928030627_acts_as_taggable_on_migration.rb
- M db/migrate/20101221123456_add_single_access_token_to_users.rb
- M db/migrate/20101221345678_add_rating_and_category_to_accounts.rb
- M db/migrate/20110719082054_add_skype_to_contacts_and_leads.rb
- M db/migrate/20111101083437_create_fields.rb
- M db/migrate/20111101090312_create_field_groups.rb
- M db/migrate/20111116091952_add_field_groups_tag_id.rb
- M db/migrate/20111117041311_change_fields_collection_to_text.rb
- M db/migrate/20111201030535_add_field_groups_klass_name.rb
- M db/migrate/20120121054235_create_lists.rb
- M db/migrate/20120216031616_create_versions.rb
- M db/migrate/20120216042541_is_paranoid_to_paper_trail.rb
- M db/migrate/20120220233724_add_versions_object_changes.rb
- M db/migrate/20120224073107_remove_default_value_and_clear_settings.rb
- M db/migrate/20120309070209_add_versions_related.rb
- M db/migrate/20120314080441_add_subscribed_users_to_entities.rb
- M db/migrate/20120316045804_activities_to_versions.rb
- M db/migrate/20120405080727_change_subscribed_users_to_set.rb
- M db/migrate/20120405080742_change_further_subscribed_users_to_set.rb
- M db/migrate/20120406082136_create_groups.rb
- M db/migrate/20120413034923_add_index_on_versions_item_type.rb
- M db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb
- M db/migrate/20120528102124_increase_length_of_version_events.rb
- M db/migrate/20120801032706_add_pair_id_to_fields.rb
- M db/migrate/20121003063155_add_settings_to_custom_fields.rb
- M db/migrate/20121221033947_fix_country_mapping.rb
- M db/migrate/20131207033244_add_user_id_to_lists.rb
- M db/migrate/20140916011927_add_created_at_index_on_versions.rb
- M db/migrate/20140916012922_add_indexes_to_model_associations.rb
- M db/migrate/20141126031837_increase_email_to254_chars.rb
- M db/migrate/20141230021159_add_transaction_id_column_to_versions.rb
- M db/migrate/20141230205453_add_missing_unique_indices.acts_as_taggable_on_engine.rb
- M db/migrate/20141230205454_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
- M db/migrate/20141230205455_add_missing_taggable_index.acts_as_taggable_on_engine.rb
- M db/migrate/20150123060900_convert_radio_to_radio_buttons.rb
- M db/migrate/20150227123054_remove_last_request_at_from_users.rb
- M db/migrate/20150427131956_create_index_related_type.rb
- M db/migrate/20160511053730_add_account_contacts_index.rb
- M lib/fat_free_crm/callback.rb
- M lib/fat_free_crm/engine.rb
- M lib/fat_free_crm/exportable.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/fat_free_crm/sortable.rb
- M lib/tasks/ffcrm/demo.rake
- 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/leads_controller_spec.rb
- M spec/controllers/entities/opportunities_controller_spec.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/opportunity_factories.rb
- M spec/factories/shared_factories.rb
- M spec/factories/task_factories.rb
- M spec/features/support/browser.rb
- M spec/lib/permissions_spec.rb
- M spec/lib/view_factory_spec.rb
- M spec/models/fields/custom_field_spec.rb
- M spec/models/observers/entity_observer_spec.rb
- M spec/models/polymorphic/version_spec.rb
- M spec/models/users/abilities/user_ability_spec.rb
- M spec/models/users/user_spec.rb
- M spec/spec_helper.rb
- M spec/views/accounts/update.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/update.js.haml_spec.rb
- M spec/views/contacts/update.js.haml_spec.rb
- M spec/views/leads/promote.js.haml_spec.rb
- M spec/views/leads/update.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/create.js.haml_spec.rb
- M spec/views/tasks/edit.js.haml_spec.rb
- M spec/views/users/change_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 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