Changeset [c0465aaab43d54fce2b44f26c4d6ad68ae850f30] by Ben Tillman

December 9th, 2011 @ 07:53 PM

Merge branch 'master' of github.com:fatfreecrm/fat_free_crm
https://github.com/fatfreecrm/fat_free_crm/commit/c0465aaab43d54fce...

Committed by Ben Tillman

  • A app/views/fields/_sidebar_show.html.haml
  • A db/migrate/20111209175716_remove_extra_contact_fields.rb
  • A lib/tasks/license.rake
  • A spec/factories/sequences.rb
  • R spec/factories.rb
  • M Gemfile
  • M Gemfile.lock
  • M app/assets/javascripts/crm_classes.js
  • M app/assets/javascripts/crm_fields.js
  • M app/assets/javascripts/crm_loginout.js
  • M app/assets/stylesheets/application.css
  • M app/assets/stylesheets/base.sass
  • M app/assets/stylesheets/header.sass
  • M app/assets/stylesheets/print.css.sass
  • M app/assets/stylesheets/rails.sass
  • M app/assets/stylesheets/safari.sass
  • M app/controllers/contacts_controller.rb
  • M app/controllers/emails_controller.rb
  • M app/controllers/tasks_controller.rb
  • M app/helpers/admin/field_groups_helper.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/fields_helper.rb
  • M app/models/core/account.rb
  • M app/models/core/account_contact.rb
  • M app/models/core/account_opportunity.rb
  • M app/models/core/campaign.rb
  • M app/models/core/contact.rb
  • M app/models/core/contact_opportunity.rb
  • M app/models/core/lead.rb
  • M app/models/core/opportunity.rb
  • M app/models/core/setting.rb
  • M app/models/core/task.rb
  • M app/models/fields/core_field.rb
  • M app/models/fields/custom_field.rb
  • M app/models/fields/field.rb
  • M app/models/fields/field_group.rb
  • M app/models/polymorphic/activity.rb
  • M app/models/polymorphic/address.rb
  • M app/models/polymorphic/avatar.rb
  • M app/models/polymorphic/comment.rb
  • M app/models/polymorphic/email.rb
  • M app/models/users/permission.rb
  • M app/models/users/preference.rb
  • M app/models/users/user.rb
  • M app/views/accounts/_sidebar_show.html.haml
  • M app/views/admin/fields/_edit.html.haml
  • M app/views/admin/fields/_field.html.haml
  • M app/views/admin/fields/edit.js.rjs
  • M app/views/campaigns/_sidebar_show.html.haml
  • M app/views/contacts/_sidebar_show.html.haml
  • M app/views/leads/_sidebar_show.html.haml
  • M app/views/opportunities/_sidebar_show.html.haml
  • M app/views/shared/_comment.html.haml
  • M config/settings.yml.example
  • M db/schema.rb
  • 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/active_model_patch.rb
  • M lib/fat_free_crm/core_ext/array.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/nil.rb
  • M lib/fat_free_crm/core_ext/string.rb
  • M lib/fat_free_crm/dropbox.rb
  • M lib/fat_free_crm/errors.rb
  • M lib/fat_free_crm/exceptions.rb
  • M lib/fat_free_crm/exportable.rb
  • M lib/fat_free_crm/fields.rb
  • M lib/fat_free_crm/i18n.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/tags.rb
  • M lib/fat_free_crm/version.rb
  • M lib/tasks/dropbox.rake
  • M lib/tasks/fat_free_crm.rake
  • M lib/tasks/git.rake
  • M lib/tasks/hooks.rake
  • M lib/tasks/plugins.rake
  • M lib/tasks/rails3_upgrade.rake
  • M lib/tasks/rspec_compatibility.rake
  • M lib/tasks/super_tags.rake
  • M spec/fixtures/account_contacts.yml
  • M spec/fixtures/account_opportunities.yml
  • M spec/fixtures/accounts.yml
  • M spec/fixtures/activities.yml
  • M spec/fixtures/addresses.yml
  • M spec/fixtures/avatars.yml
  • M spec/fixtures/campaigns.yml
  • M spec/fixtures/comments.yml
  • M spec/fixtures/contact_opportunities.yml
  • M spec/fixtures/contacts.yml
  • M spec/fixtures/emails.yml
  • M spec/fixtures/leads.yml
  • M spec/fixtures/opportunities.yml
  • M spec/fixtures/permissions.yml
  • M spec/fixtures/preferences.yml
  • M spec/fixtures/settings.yml
  • M spec/fixtures/tasks.yml
  • M spec/fixtures/users.yml
  • M spec/helpers/fields_helper_spec.rb
  • M spec/models/account_contact_spec.rb
  • M spec/models/account_opportunity_spec.rb
  • M spec/models/account_spec.rb
  • M spec/models/activity_spec.rb
  • M spec/models/address_spec.rb
  • M spec/models/avatar_spec.rb
  • M spec/models/campaign_spec.rb
  • M spec/models/comment_spec.rb
  • M spec/models/contact_opportunity_spec.rb
  • M spec/models/contact_spec.rb
  • M spec/models/custom_field_spec.rb
  • M spec/models/email_spec.rb
  • M spec/models/field_group_spec.rb
  • M spec/models/field_spec.rb
  • M spec/models/lead_spec.rb
  • M spec/models/opportunity_spec.rb
  • M spec/models/permission_spec.rb
  • M spec/models/preference_spec.rb
  • M spec/models/setting_spec.rb
  • M spec/models/task_spec.rb
  • M spec/models/user_spec.rb
  • M spec/spec_helper.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