Changeset [f8f861d87e197088c1384f1dd090a199c5151889] by Steve Kenworthy

December 21st, 2012 @ 08:33 PM

Merge remote-tracking branch 'unboxed/adding_team_tab' into adding_team_tab

Conflicts:

Capfile
Gemfile
Gemfile.lock
app/controllers/entities/accounts_controller.rb
app/controllers/entities/campaigns_controller.rb
app/controllers/entities/contacts_controller.rb
app/controllers/entities_controller.rb
app/controllers/home_controller.rb
app/models/entities/opportunity.rb
app/models/polymorphic/task.rb
app/views/accounts/_new.html.haml
app/views/campaigns/_new.html.haml
app/views/contacts/_new.html.haml
app/views/leads/_new.html.haml
app/views/opportunities/_new.html.haml
app/views/users/update.js.rjs
app/views/versions/_versions.html.haml
config/locales/en-GB_fat_free_crm.yml
fat_free_crm.gemspec
spec/acceptance/dashboard_spec.rb
spec/acceptance/support/paths.rb
spec/controllers/entities/accounts_controller_spec.rb
spec/controllers/entities/campaigns_controller_spec.rb
spec/controllers/entities/contacts_controller_spec.rb
spec/controllers/entities/leads_controller_spec.rb
spec/controllers/entities/opportunities_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/models/entities/opportunity_spec.rb

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

Committed by Steve Kenworthy

  • A app/views/users/_user_report.html.haml
  • A app/views/users/opportunities_overview.html.haml
  • A config/deploy.rb
  • A config/deploy/production.rb
  • A config/deploy/staging.rb
  • A spec/acceptance/opportunities_overview_spec.rb
  • M Capfile
  • M Gemfile.lock
  • M app/controllers/home_controller.rb
  • M app/controllers/users_controller.rb
  • M app/models/entities/opportunity.rb
  • M app/models/observers/entity_observer.rb
  • M app/models/users/user.rb
  • M config/environments/development.rb
  • M config/environments/production.rb
  • M config/environments/staging.rb
  • M config/locales/en-GB_fat_free_crm.yml
  • M config/locales/en-US_fat_free_crm.yml
  • M config/routes.rb
  • M config/settings.default.yml
  • M lib/fat_free_crm/core_ext/array.rb
  • M spec/acceptance/accounts_spec.rb
  • M spec/acceptance/campaigns_spec.rb
  • M spec/acceptance/contacts_spec.rb
  • M spec/acceptance/leads_spec.rb
  • M spec/acceptance/opportunities_spec.rb
  • M spec/acceptance/support/paths.rb
  • M spec/controllers/entities/leads_controller_spec.rb
  • M spec/controllers/home_controller_spec.rb
  • M spec/controllers/users_controller_spec.rb
  • M spec/factories/opportunity_factories.rb
  • M spec/models/entities/opportunity_spec.rb
  • M spec/models/observers/entity_observer_spec.rb
  • M spec/models/users/user_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