Changeset [fcb7b712fd4168f607017cf6d789386ca3ba12b1] by Nathan Broadbent

February 16th, 2012 @ 12:04 AM

Merge branch 'chosen' into ransack_chosen

Conflicts:

Gemfile
Gemfile.lock
app/assets/javascripts/application.js.erb
app/assets/stylesheets/common.sass

https://github.com/fatfreecrm/fat_free_crm/commit/fcb7b712fd4168f60...

Committed by Nathan Broadbent

  • A app/assets/javascripts/crm_chosen.js.coffee
  • A app/assets/stylesheets/ffcrm_chosen.sass
  • A app/assets/stylesheets/fields.sass
  • A vendor/assets/javascripts/event.simulate.js
  • M Gemfile
  • M Gemfile.lock
  • 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/base_controller.rb
  • M app/helpers/accounts_helper.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/users_helper.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/new.js.rjs
  • M app/views/campaigns/create.js.rjs
  • M app/views/campaigns/edit.js.rjs
  • 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/new.js.rjs
  • M app/views/fields/_group.html.haml
  • M app/views/fields/_groups.html.haml
  • M app/views/fields/group.js.rjs
  • 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/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/new.js.rjs
  • 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
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