Changeset [94adc8a478f48d49bff6acde6422a989c22145bc] by Mike Dvorkin

March 16th, 2010 @ 07:55 PM

Merge branch 'master' of git://github.com/enderson/fat_free_crm into enderson/master
http://github.com/michaeldv/fat_free_crm/commit/94adc8a478f48d49bff...

Committed by Mike Dvorkin

  • A app/helpers/addresses_helper.rb
  • A app/models/address.rb
  • 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 app/views/common/_address.html.haml
  • A app/views/common/_address_show.html.haml
  • A app/views/common/_edit_comment.html.haml
  • A config/initializers/postgresql.rb
  • A config/locales/es-ES.yml
  • A config/locales/es-ES_fat_free_crm.yml
  • A db/migrate/024_add_email_to_accounts.rb
  • A db/migrate/025_add_background_info_to_models.rb
  • A db/migrate/026_create_addresses.rb
  • A lib/fat_free_crm/core_ext/nil.rb
  • A lib/fat_free_crm/mysql_utf8.rb
  • A spec/fixtures/addresses.yml
  • A spec/models/address_spec.rb
  • A vendor/plugins/country_select/MIT-LICENSE
  • A vendor/plugins/country_select/README
  • A vendor/plugins/country_select/init.rb
  • A vendor/plugins/country_select/install.rb
  • A vendor/plugins/country_select/lib/country_select.rb
  • A vendor/plugins/country_select/uninstall.rb
  • R app/views/comments/edit.html.erb
  • 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 spec/views/comments/edit.html.erb_spec.rb
  • M .gitignore
  • M CHANGELOG
  • M CONTRIBUTORS
  • M README.rdoc
  • M app/controllers/accounts_controller.rb
  • M app/controllers/admin/application_controller.rb
  • M app/controllers/admin/plugins_controller.rb
  • M app/controllers/admin/settings_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/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/passwords_controller.rb
  • M app/controllers/tasks_controller.rb
  • M app/controllers/users_controller.rb
  • M app/helpers/accounts_helper.rb
  • M app/helpers/admin/application_helper.rb
  • M app/helpers/admin/plugins_helper.rb
  • M app/helpers/admin/settings_helper.rb
  • M app/helpers/admin/users_helper.rb
  • M app/helpers/ajax_will_paginate.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/authentications_helper.rb
  • M app/helpers/campaigns_helper.rb
  • M app/helpers/comments_helper.rb
  • M app/helpers/contacts_helper.rb
  • M app/helpers/home_helper.rb
  • M app/helpers/leads_helper.rb
  • M app/helpers/opportunities_helper.rb
  • M app/helpers/passwords_helper.rb
  • M app/helpers/tasks_helper.rb
  • M app/helpers/users_helper.rb
  • M app/models/account.rb
  • M app/models/account_contact.rb
  • M app/models/account_opportunity.rb
  • M app/models/activity.rb
  • M app/models/activity_observer.rb
  • M app/models/authentication.rb
  • M app/models/avatar.rb
  • M app/models/campaign.rb
  • M app/models/comment.rb
  • M app/models/contact.rb
  • M app/models/contact_opportunity.rb
  • M app/models/lead.rb
  • M app/models/notifier.rb
  • M app/models/opportunity.rb
  • M app/models/permission.rb
  • M app/models/preference.rb
  • M app/models/setting.rb
  • M app/models/task.rb
  • M app/models/user.rb
  • M app/stylesheets/base.sass
  • M app/stylesheets/common.sass
  • M app/stylesheets/header.sass
  • M app/stylesheets/rails.sass
  • M app/stylesheets/safari.sass
  • M app/stylesheets/screen.sass
  • M app/views/accounts/_account.html.haml
  • M app/views/accounts/_contact_info.html.haml
  • M app/views/accounts/_create.html.haml
  • M app/views/accounts/_edit.html.haml
  • M app/views/accounts/_permissions.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/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/_sidebar_index.html.haml
  • M app/views/campaigns/_sidebar_show.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/common/_comment.html.haml
  • M app/views/contacts/_create.html.haml
  • M app/views/contacts/_edit.html.haml
  • M app/views/contacts/_extra.html.haml
  • M app/views/contacts/_permissions.html.haml
  • M app/views/contacts/_sidebar_index.html.haml
  • M app/views/contacts/_sidebar_show.html.haml
  • M app/views/contacts/_top_section.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/_contact.html.haml
  • M app/views/leads/_convert.html.haml
  • M app/views/leads/_create.html.haml
  • M app/views/leads/_edit.html.haml
  • M app/views/leads/_permissions.html.haml
  • M app/views/leads/_sidebar_index.html.haml
  • M app/views/leads/_sidebar_show.html.haml
  • M app/views/leads/_status.html.haml
  • M app/views/leads/_top_section.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/_sidebar_index.html.haml
  • M app/views/opportunities/_sidebar_show.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/_assigned.html.haml
  • M app/views/tasks/_completed.html.haml
  • M app/views/tasks/_edit.html.haml
  • M app/views/tasks/_empty.html.haml
  • M app/views/tasks/_pending.html.haml
  • M app/views/tasks/_top_section.html.haml
  • M app/views/tasks/create.js.rjs
  • M app/views/tasks/edit.js.rjs
  • M app/views/tasks/new.js.rjs
  • M app/views/tasks/update.js.rjs
  • M app/views/users/_profile.html.haml
  • M app/views/users/_user.html.haml
  • 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/fr.yml
  • M config/locales/fr_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.yml
  • M config/locales/ru_fat_free_crm.yml
  • M config/locales/th_fat_free_crm.yml
  • M config/settings.yml
  • M lib/fat_free_crm.rb
  • M lib/fat_free_crm/callback.rb
  • M lib/fat_free_crm/core_ext.rb
  • M lib/fat_free_crm/core_ext/helpers.rb
  • M lib/fat_free_crm/core_ext/logger.rb
  • M lib/fat_free_crm/core_ext/named_scope.rb
  • M lib/fat_free_crm/core_ext/string.rb
  • M lib/fat_free_crm/exceptions.rb
  • M lib/fat_free_crm/permissions.rb
  • M lib/fat_free_crm/plugin.rb
  • M lib/fat_free_crm/sortable.rb
  • M lib/fat_free_crm/tabs.rb
  • M lib/fat_free_crm/version.rb
  • M lib/tasks/fat_free_crm.rake
  • M public/javascripts/application.js
  • M public/javascripts/crm_classes.js
  • M public/javascripts/crm_loginout.js
  • M public/stylesheets/base.css
  • M public/stylesheets/common.css
  • M public/stylesheets/rails.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/fixtures/campaigns.yml
  • M spec/fixtures/comments.yml
  • M spec/fixtures/contacts.yml
  • M spec/fixtures/leads.yml
  • M spec/fixtures/opportunities.yml
  • M spec/fixtures/tasks.yml
  • M spec/models/account_spec.rb
  • M spec/models/task_spec.rb
  • M spec/spec_helper.rb
  • M spec/views/accounts/_create.haml_spec.rb
  • M spec/views/accounts/_edit.haml_spec.rb
  • M spec/views/accounts/show.haml_spec.rb
  • M spec/views/campaigns/_create.haml_spec.rb
  • M spec/views/campaigns/_edit.haml_spec.rb
  • M spec/views/campaigns/show.haml_spec.rb
  • M spec/views/contacts/_create.haml_spec.rb
  • M spec/views/contacts/_edit.haml_spec.rb
  • M spec/views/contacts/show.haml_spec.rb
  • M spec/views/home/options.rjs_spec.rb
  • M spec/views/leads/_create.haml_spec.rb
  • M spec/views/leads/_edit.haml_spec.rb
  • M spec/views/leads/show.rjs_spec.rb
  • M spec/views/opportunities/_create.haml_spec.rb
  • M spec/views/opportunities/_edit.haml_spec.rb
  • M spec/views/opportunities/show.haml_spec.rb
  • M spec/views/tasks/_edit.haml_spec.rb
  • M spec/views/tasks/create.rjs_spec.rb
  • M spec/views/tasks/new.rjs_spec.rb
  • M spec/views/tasks/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