Changeset [5c89640cd89f1cb2438b7f100aeaf2c7865c51c1] by Nathan Broadbent

June 12th, 2012 @ 10:11 PM

Merge branch 'master' into cloudfuji

Conflicts:

Gemfile.lock

https://github.com/fatfreecrm/fat_free_crm/commit/5c89640cd89f1cb24...

Committed by Nathan Broadbent

  • A app/views/home/_account.html.haml
  • A app/views/home/_opportunity.html.haml
  • A app/views/home/_task.html.haml
  • A spec/acceptance/acceptance_helper.rb
  • A spec/acceptance/accounts_spec.rb
  • A spec/acceptance/campaigns_spec.rb
  • A spec/acceptance/contacts_spec.rb
  • A spec/acceptance/dashboard_spec.rb
  • A spec/acceptance/leads_spec.rb
  • A spec/acceptance/opportunities_spec.rb
  • A spec/acceptance/support/browser.rb
  • A spec/acceptance/support/headless.rb
  • A spec/acceptance/support/helpers.rb
  • A spec/acceptance/support/maintain_sessions.rb
  • A spec/acceptance/support/paths.rb
  • A spec/acceptance/support/selector_helpers.rb
  • A spec/acceptance/tasks_spec.rb
  • R acceptance/support/chosen_select.rb
  • R acceptance/support/database_cleaner.rb
  • R acceptance/acceptance_helper.rb
  • R acceptance/accounts_spec.rb
  • R acceptance/campaigns_spec.rb
  • R acceptance/contacts_spec.rb
  • R acceptance/leads_spec.rb
  • R acceptance/opportunities_spec.rb
  • R acceptance/support/browser.rb
  • R acceptance/support/headless.rb
  • R acceptance/support/helpers.rb
  • R acceptance/support/maintain_sessions.rb
  • R acceptance/support/paths.rb
  • M .travis.yml
  • M Gemfile
  • M Gemfile.lock
  • M app/assets/stylesheets/common.scss
  • M app/controllers/admin/tags_controller.rb
  • M app/controllers/home_controller.rb
  • M app/helpers/crm_tags_helper.rb
  • M app/helpers/home_helper.rb
  • M app/models/entities/account.rb
  • M app/models/entities/opportunity.rb
  • M app/models/polymorphic/task.rb
  • M app/views/home/index.html.haml
  • M app/views/versions/_versions.html.haml
  • M config/locales/en-GB_fat_free_crm.yml
  • M config/locales/en-US_fat_free_crm.yml
  • M spec/controllers/home_controller_spec.rb
  • M spec/models/entities/account_spec.rb
  • M spec/models/entities/opportunity_spec.rb
  • M spec/models/polymorphic/task_spec.rb
  • M spec/spec_helper.rb
  • M spec/views/home/index.haml_spec.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