Changeset [014d41917ea9678c70fb5f61588838b6da98d884] by Roman Smirnov
January 19th, 2010 @ 04:44 AM
Merge branch 'master' of git://github.com/michaeldv/fat_free_crm
Resolved conflicts:
config/locales/ru_fat_free_crm.yml
http://github.com/michaeldv/fat_free_crm/commit/014d41917ea9678c70f...
Committed by Roman Smirnov
- A config/locales/es-ES.yml
- A config/locales/es-ES_fat_free_crm.yml
- A lib/fat_free_crm/mysql_utf8.rb
- M CHANGELOG
- 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/contacts/_top_section.html.haml
- M app/views/leads/_convert.html.haml
- M app/views/leads/_status.html.haml
- M app/views/opportunities/_top_section.html.haml
- M app/views/users/_user.html.haml
- M config/locales/en-US_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 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/comments_controller_spec.rb
- M spec/factories.rb
- M spec/spec_helper.rb
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