Changeset [4ea8fcb5392f54478cf221325c4a9139e6399c5c] by Mike Dvorkin
February 21st, 2010 @ 03:47 PM
Resolved merge conflicts
http://github.com/michaeldv/fat_free_crm/commit/4ea8fcb5392f54478cf...
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/common/_address.html.haml
- A app/views/common/_address_show.html.haml
- A app/views/common/_background_info.html.haml
- 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 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 spec/views/comments/edit.html.erb_spec.rb
- 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/campaign.rb
- M app/models/contact.rb
- M app/models/lead.rb
- M app/models/opportunity.rb
- M app/stylesheets/common.sass
- 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/_sidebar_index.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/_create.html.haml
- M app/views/campaigns/_edit.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/comments/edit.js.rjs
- M app/views/comments/update.js.rjs
- 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/_sidebar_index.html.haml
- M app/views/contacts/_sidebar_show.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/layouts/_sidebar.html.haml
- M app/views/leads/_contact.html.haml
- M app/views/leads/_create.html.haml
- M app/views/leads/_edit.html.haml
- M app/views/leads/_sidebar_index.html.haml
- M app/views/leads/_sidebar_show.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/_create.html.haml
- M app/views/opportunities/_edit.html.haml
- M app/views/opportunities/_opportunity.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/_edit.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/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 db/development_structure.sql
- 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/fixtures/campaigns.yml
- M spec/fixtures/contacts.yml
- M spec/fixtures/leads.yml
- M spec/fixtures/opportunities.yml
- 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/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/show.haml_spec.rb
- M spec/views/tasks/_edit.haml_spec.rb
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