Changeset [7c30c1e75776d05740c4c1347bdde7debbef22a4] by Enderson Maia

February 24th, 2010 @ 11:20 AM

Merge branch 'master' of git://github.com/michaeldv/fat_free_crm
http://github.com/michaeldv/fat_free_crm/commit/7c30c1e75776d05740c...

Committed by Enderson Maia

  • A app/views/comments/_comment.html.haml
  • A app/views/comments/_edit.html.haml
  • A app/views/comments/_new.html.haml
  • A app/views/comments/destroy.js.rjs
  • A app/views/comments/edit.js.rjs
  • A app/views/comments/update.js.rjs
  • A config/initializers/postgresql.rb
  • A db/migrate/024_add_email_to_accounts.rb
  • A lib/fat_free_crm/core_ext/nil.rb
  • R app/views/comments/edit.html.erb
  • R app/views/common/_comment.html.haml
  • R app/views/common/_new_comment.html.haml
  • R config/locales/es-MX.yml
  • R config/locales/es-MX_fat_free_crm.yml
  • R config/locales/fi.yml
  • R config/locales/fi_fat_free_crm.yml
  • R config/locales/fr.yml
  • R config/locales/fr_fat_free_crm.yml
  • R spec/views/comments/edit.html.erb_spec.rb
  • M .gitignore
  • M CHANGELOG
  • M README.rdoc
  • M app/controllers/accounts_controller.rb
  • M app/controllers/authentications_controller.rb
  • M app/controllers/campaigns_controller.rb
  • M app/controllers/comments_controller.rb
  • M app/controllers/contacts_controller.rb
  • M app/controllers/home_controller.rb
  • M app/controllers/leads_controller.rb
  • M app/controllers/opportunities_controller.rb
  • M app/controllers/tasks_controller.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/leads_helper.rb
  • M app/models/account.rb
  • M app/models/comment.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/_permissions.html.haml
  • M app/views/accounts/_sidebar_show.html.haml
  • M app/views/accounts/edit.js.rjs
  • M app/views/accounts/show.html.haml
  • M app/views/admin/users/_user.html.haml
  • M app/views/admin/users/edit.js.rjs
  • M app/views/campaigns/_permissions.html.haml
  • M app/views/campaigns/_top_section.html.haml
  • M app/views/campaigns/edit.js.rjs
  • M app/views/campaigns/show.html.haml
  • M app/views/comments/create.js.rjs
  • M app/views/contacts/_permissions.html.haml
  • M app/views/contacts/edit.js.rjs
  • M app/views/contacts/show.html.haml
  • M app/views/home/_activity.html.haml
  • M app/views/home/_duration.html.haml
  • M app/views/home/_options.html.haml
  • M app/views/home/_users.html.haml
  • M app/views/layouts/_sidebar.html.haml
  • M app/views/layouts/application.html.haml
  • M app/views/leads/_permissions.html.haml
  • M app/views/leads/convert.js.rjs
  • M app/views/leads/edit.js.rjs
  • M app/views/leads/show.html.haml
  • M app/views/opportunities/_opportunity.html.haml
  • M app/views/opportunities/_permissions.html.haml
  • M app/views/opportunities/_top_section.html.haml
  • M app/views/opportunities/edit.js.rjs
  • M app/views/opportunities/show.html.haml
  • M app/views/tasks/_edit.html.haml
  • M app/views/tasks/_empty.html.haml
  • M app/views/tasks/_top_section.html.haml
  • M app/views/tasks/edit.js.rjs
  • M app/views/users/avatar.js.rjs
  • M app/views/users/edit.js.rjs
  • M app/views/users/password.js.rjs
  • M config.ru
  • M config/initializers/fat_free_crm.rb
  • M config/locales/de_fat_free_crm.yml
  • M config/locales/en-US_fat_free_crm.yml
  • M config/locales/es-ES_fat_free_crm.yml
  • M config/locales/pl_fat_free_crm.yml
  • M config/locales/pt-BR_fat_free_crm.yml
  • M config/locales/ru_fat_free_crm.yml
  • M config/locales/th_fat_free_crm.yml
  • M config/settings.yml
  • M public/stylesheets/common.css
  • M public/stylesheets/screen.css
  • M spec/controllers/authentications_controller_spec.rb
  • M spec/controllers/comments_controller_spec.rb
  • M spec/factories.rb
  • M spec/fixtures/accounts.yml
  • M spec/models/account_spec.rb
  • M spec/models/task_spec.rb
  • M spec/spec_helper.rb
  • M spec/views/accounts/show.haml_spec.rb
  • M spec/views/campaigns/show.haml_spec.rb
  • M spec/views/contacts/show.haml_spec.rb
  • M spec/views/home/options.rjs_spec.rb
  • M spec/views/leads/show.rjs_spec.rb
  • M spec/views/opportunities/show.haml_spec.rb
  • M spec/views/tasks/_edit.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