Changeset [fdbd6897372db48ab8c80b218532612d1cac17eb] by Enderson Maia

December 23rd, 2009 @ 09:44 AM

Merge branch 'master' of git://github.com/michaeldv/fat_free_crm

Conflicts:

app/views/common/_search.html.haml
spec/views/opportunities/destroy.rjs_spec.rb

http://github.com/michaeldv/fat_free_crm/commit/fdbd6897372db48ab8c...

Committed by Enderson Maia

  • R vendor/plugins/simple_column_search/.gitignore
  • M CHANGELOG
  • M app/helpers/application_helper.rb
  • M app/models/activity_observer.rb
  • M app/views/common/_search.html.haml
  • M app/views/layouts/_sidebar.html.haml
  • M spec/controllers/accounts_controller_spec.rb
  • M spec/models/activity_spec.rb
  • M spec/views/opportunities/destroy.rjs_spec.rb
  • M vendor/plugins/simple_column_search/CHANGELOG
  • M vendor/plugins/simple_column_search/README.rdoc
  • M vendor/plugins/simple_column_search/Rakefile
  • M vendor/plugins/simple_column_search/lib/simple_column_search.rb
  • M vendor/plugins/simple_column_search/simple_column_search.gemspec
  • M vendor/plugins/simple_column_search/spec/spec_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