Changeset [60bdb16fb38653cf6b4d0ab6afe0bd0e2e3c9c4a] by Enderson Maia

December 23rd, 2009 @ 09:48 AM

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

Conflicts:

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

http://github.com/michaeldv/fat_free_crm/commit/60bdb16fb38653cf6b4...

Committed by Enderson Maia

  • A app/views/layouts/500.html.haml
  • A config/locales/pt-BR.yml
  • A config/locales/pt-BR_fat_free_crm.yml
  • A lib/fat_free_crm/exceptions.rb
  • M CHANGELOG
  • M app/controllers/accounts_controller.rb
  • M app/controllers/admin/application_controller.rb
  • M app/controllers/admin/users_controller.rb
  • M app/controllers/application_controller.rb
  • M app/controllers/authentications_controller.rb
  • M app/controllers/campaigns_controller.rb
  • M app/controllers/contacts_controller.rb
  • M app/controllers/leads_controller.rb
  • M app/controllers/opportunities_controller.rb
  • M app/controllers/passwords_controller.rb
  • M app/controllers/users_controller.rb
  • M app/helpers/application_helper.rb
  • M app/models/account.rb
  • M app/models/authentication.rb
  • M app/models/campaign.rb
  • M app/models/contact.rb
  • M app/models/lead.rb
  • M app/models/notifier.rb
  • M app/models/opportunity.rb
  • M app/models/task.rb
  • M app/models/user.rb
  • M app/stylesheets/rails.sass
  • M app/views/accounts/_permissions.html.haml
  • M app/views/accounts/_top_section.html.haml
  • M app/views/admin/users/_confirm.html.haml
  • M app/views/authentications/new.html.haml
  • M app/views/campaigns/_metrics.html.haml
  • M app/views/campaigns/_objectives.html.haml
  • M app/views/campaigns/_permissions.html.haml
  • M app/views/campaigns/_sidebar_index.html.haml
  • M app/views/campaigns/_sidebar_show.html.haml
  • M app/views/campaigns/_status.html.haml
  • M app/views/campaigns/_top_section.html.haml
  • M app/views/comments/create.js.rjs
  • M app/views/common/_comment.html.haml
  • M app/views/common/_new_comment.html.haml
  • M app/views/common/_recently.html.haml
  • M app/views/common/_search.html.haml
  • M app/views/contacts/_contact.html.haml
  • M app/views/contacts/_permissions.html.haml
  • M app/views/layouts/_about.html.haml
  • M app/views/leads/_convert_permissions.html.haml
  • M app/views/leads/_lead.html.haml
  • M app/views/leads/_permissions.html.haml
  • M app/views/opportunities/_opportunity.html.haml
  • M app/views/opportunities/_permissions.html.haml
  • M app/views/passwords/edit.html.haml
  • M app/views/passwords/new.html.haml
  • M app/views/tasks/_assigned.html.haml
  • M app/views/tasks/_pending.html.haml
  • M app/views/tasks/_related.html.haml
  • M app/views/tasks/_selector.html.haml
  • M app/views/tasks/_top_section.html.haml
  • M config/locales/en-US_fat_free_crm.yml
  • M config/locales/ru_fat_free_crm.yml
  • M config/locales/th_fat_free_crm.yml
  • M lib/fat_free_crm.rb
  • M lib/fat_free_crm/tabs.rb
  • M public/stylesheets/rails.css
  • M public/stylesheets/screen.css
  • M spec/factories.rb
  • M spec/views/opportunities/destroy.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