Changeset [eec20f0c00c6b80fa7c6bd491519d2a845fcaf64] by Nathan B

March 17th, 2011 @ 02:22 AM

Merge branch 'ffcrm_rails3' into cr_merge

Conflicts:

Gemfile
Gemfile.lock
app/controllers/accounts_controller.rb
app/helpers/admin/users_helper.rb
app/helpers/home_helper.rb
app/models/activity.rb
app/views/accounts/_top_section.html.haml
app/views/tasks/_pending.html.haml
lib/tasks/fat_free_crm.rake
spec/controllers/tasks_controller_spec.rb

https://github.com/michaeldv/fat_free_crm/commit/eec20f0c00c6b80fa7...

Committed by Nathan B

  • A db/migrate/031_add_rating_and_category_to_accounts.rb
  • R config/schedule.rb
  • M Gemfile
  • M Gemfile.lock
  • M app/controllers/accounts_controller.rb
  • M app/controllers/admin/users_controller.rb
  • M app/controllers/application_controller.rb
  • M app/controllers/opportunities_controller.rb
  • M app/helpers/accounts_helper.rb
  • M app/helpers/admin/users_helper.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/campaigns_helper.rb
  • M app/helpers/leads_helper.rb
  • M app/helpers/opportunities_helper.rb
  • M app/helpers/tasks_helper.rb
  • M app/models/account.rb
  • M app/models/opportunity.rb
  • M app/models/task.rb
  • M app/stylesheets/common.sass
  • M app/views/accounts/_account.html.haml
  • M app/views/accounts/_contact_info.html.haml
  • M app/views/accounts/_sidebar_index.html.haml
  • M app/views/accounts/_sidebar_show.html.haml
  • M app/views/accounts/_top_section.html.haml
  • M app/views/accounts/create.js.rjs
  • M app/views/accounts/destroy.js.rjs
  • M app/views/accounts/update.js.rjs
  • M app/views/admin/users/index.html.haml
  • M app/views/common/_inline_styles.html.haml
  • M app/views/common/attach.js.rjs
  • M app/views/common/discard.rjs
  • M app/views/common/index.atom.builder
  • M app/views/common/index.rss.builder
  • M app/views/leads/_sidebar_show.html.haml
  • M app/views/leads/_status.html.haml
  • M app/views/opportunities/create.js.rjs
  • M app/views/opportunities/destroy.js.rjs
  • M app/views/opportunities/update.js.rjs
  • M app/views/tasks/_pending.html.haml
  • M app/views/tasks/_title.html.haml
  • M app/views/tasks/index.html.haml
  • M config/locales/en-US_fat_free_crm.yml
  • M config/settings.yml
  • M lib/fat_free_crm/core_ext/array.rb
  • M lib/tasks/fat_free_crm.rake
  • M public/stylesheets/common.css
  • M public/stylesheets/screen.css
  • M spec/controllers/accounts_controller_spec.rb
  • M spec/controllers/opportunities_controller_spec.rb
  • M spec/controllers/tasks_controller_spec.rb
  • M spec/fixtures/accounts.yml
  • M spec/models/account_spec.rb
  • M spec/models/opportunity_spec.rb
  • M spec/models/task_spec.rb
  • M spec/shared/controllers.rb
  • M spec/views/accounts/create.rjs_spec.rb
  • M spec/views/accounts/destroy.rjs_spec.rb
  • M spec/views/accounts/update.rjs_spec.rb
  • M spec/views/campaigns/create.rjs_spec.rb
  • M spec/views/campaigns/destroy.rjs_spec.rb
  • M spec/views/campaigns/update.rjs_spec.rb
  • M spec/views/leads/create.rjs_spec.rb
  • M spec/views/leads/destroy.rjs_spec.rb
  • M spec/views/leads/promote.rjs_spec.rb
  • M spec/views/leads/reject.rjs_spec.rb
  • M spec/views/leads/update.rjs_spec.rb
  • M spec/views/opportunities/create.rjs_spec.rb
  • M spec/views/opportunities/destroy.rjs_spec.rb
  • M spec/views/opportunities/update.rjs_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