Changeset [62d3dad3c2edd63c4d3771c7cf74ac5951e5cf0c] by Nathan Broadbent

February 22nd, 2012 @ 08:08 PM

Merge branch 'gem' of github.com:fatfreecrm/fat_free_crm into gem
https://github.com/fatfreecrm/fat_free_crm/commit/62d3dad3c2edd63c4...

Committed by Nathan Broadbent

  • A app/assets/javascripts/crm_chosen.js.coffee
  • A app/assets/javascripts/jquery-noconflict.js
  • A app/assets/javascripts/lists.js.coffee
  • A app/assets/javascripts/search.js.coffee
  • A app/assets/stylesheets/ffcrm_chosen.sass
  • A app/assets/stylesheets/fields.sass
  • A app/assets/stylesheets/lists.css.scss
  • A app/controllers/admin/tags_controller.rb
  • A app/controllers/lists_controller.rb
  • A app/helpers/admin/tags_helper.rb
  • A app/helpers/lists_helper.rb
  • A app/models/list.rb
  • A app/views/admin/field_groups/_confirm.html.haml
  • A app/views/admin/field_groups/confirm.js.rjs
  • A app/views/admin/field_groups/destroy.js.rjs
  • A app/views/admin/plugins/_plugin.html.haml
  • A app/views/admin/tags/_confirm.html.haml
  • A app/views/admin/tags/_edit.html.haml
  • A app/views/admin/tags/_new.html.haml
  • A app/views/admin/tags/_tag.html.haml
  • A app/views/admin/tags/_top_section.html.haml
  • A app/views/admin/tags/confirm.js.rjs
  • A app/views/admin/tags/create.js.rjs
  • A app/views/admin/tags/destroy.js.rjs
  • A app/views/admin/tags/edit.js.rjs
  • A app/views/admin/tags/index.html.haml
  • A app/views/admin/tags/new.js.rjs
  • A app/views/admin/tags/update.js.rjs
  • A app/views/base/_advanced_search.html.haml
  • A app/views/base/_condition_fields.html.haml
  • A app/views/base/_grouping_fields.html.haml
  • A app/views/base/_sort_fields.html.haml
  • A app/views/base/advanced_search.js.rjs
  • A app/views/lists/create.js.rjs
  • A app/views/lists/destroy.js.rjs
  • A app/views/shared/_lists.html.haml
  • A db/migrate/20120121054235_create_lists.rb
  • A spec/controllers/lists_controller_spec.rb
  • A spec/factories/list_factories.rb
  • A spec/helpers/lists_helper_spec.rb
  • A spec/models/list_spec.rb
  • A vendor/assets/images/delete.png
  • A vendor/assets/javascripts/event.simulate.js
  • M app/assets/javascripts/application.js.erb
  • M app/assets/javascripts/crm.js
  • M app/assets/javascripts/crm_fields.js
  • M app/assets/stylesheets/application.css.erb
  • M app/assets/stylesheets/base.sass
  • M app/assets/stylesheets/common.sass
  • M app/controllers/admin/application_controller.rb
  • M app/controllers/admin/field_groups_controller.rb
  • M app/controllers/admin/fields_controller.rb
  • M app/controllers/admin/plugins_controller.rb
  • M app/controllers/admin/users_controller.rb
  • M app/controllers/base_controller.rb
  • M app/helpers/accounts_helper.rb
  • M app/helpers/admin/application_helper.rb
  • M app/helpers/admin/field_groups_helper.rb
  • M app/helpers/admin/users_helper.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/users_helper.rb
  • M app/models/base/account.rb
  • M app/models/base/campaign.rb
  • M app/models/base/contact.rb
  • M app/models/base/lead.rb
  • M app/models/base/opportunity.rb
  • M app/models/base/task.rb
  • M app/models/fields/field_group.rb
  • M app/models/polymorphic/tag.rb
  • M app/models/users/user.rb
  • M app/views/accounts/_top_section.html.haml
  • M app/views/accounts/create.js.rjs
  • M app/views/accounts/edit.js.rjs
  • M app/views/accounts/index.html.haml
  • M app/views/accounts/new.js.rjs
  • M app/views/admin/field_groups/_field_group.html.haml
  • M app/views/admin/fields/destroy.js.rjs
  • M app/views/admin/fields/options.js.rjs
  • M app/views/admin/plugins/index.html.haml
  • M app/views/admin/users/_confirm.html.haml
  • M app/views/admin/users/index.html.haml
  • M app/views/campaigns/create.js.rjs
  • M app/views/campaigns/edit.js.rjs
  • M app/views/campaigns/index.html.haml
  • M app/views/campaigns/new.js.rjs
  • M app/views/contacts/_top_section.html.haml
  • M app/views/contacts/create.js.rjs
  • M app/views/contacts/edit.js.rjs
  • M app/views/contacts/index.html.haml
  • M app/views/contacts/new.js.rjs
  • M app/views/emails/_email.html.haml
  • M app/views/fields/_group.html.haml
  • M app/views/fields/_groups.html.haml
  • M app/views/fields/group.js.rjs
  • M app/views/layouts/_sidebar.html.haml
  • M app/views/layouts/application.html.haml
  • M app/views/leads/_convert.html.haml
  • M app/views/leads/_status.html.haml
  • M app/views/leads/create.js.rjs
  • M app/views/leads/edit.js.rjs
  • M app/views/leads/index.html.haml
  • M app/views/leads/new.js.rjs
  • M app/views/opportunities/_top_section.html.haml
  • M app/views/opportunities/create.js.rjs
  • M app/views/opportunities/edit.js.rjs
  • M app/views/opportunities/index.html.haml
  • M app/views/opportunities/new.js.rjs
  • M app/views/shared/_empty.html.haml
  • M app/views/shared/_search.html.haml
  • M app/views/shared/_tags.html.haml
  • M app/views/tasks/_top_section.html.haml
  • M app/views/tasks/edit.js.rjs
  • M app/views/tasks/new.js.rjs
  • M config/locales/en-US_fat_free_crm.yml
  • M config/routes.rb
  • M config/settings.yml.example
  • M db/schema.rb
  • M lib/overrides/rails/text_helper.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