Changeset [757e180cc3feb9f5bc4e60ac868d1e5337f409e6] by Nathan Broadbent

December 7th, 2011 @ 07:05 PM

Merge branch 'master' of github.com:fatfreecrm/fat_free_crm into ffcrm
https://github.com/fatfreecrm/fat_free_crm/commit/757e180cc3feb9f5b...

Committed by Nathan Broadbent

  • A app/assets/javascripts/admin/field_groups.js.coffee
  • A app/assets/stylesheets/admin/field_groups.css.scss
  • A app/controllers/admin/field_groups_controller.rb
  • A app/helpers/admin/field_groups_helper.rb
  • A app/views/admin/field_groups/_edit.html.haml
  • A app/views/admin/field_groups/_field_group.html.haml
  • A app/views/admin/field_groups/_new.html.haml
  • A app/views/admin/field_groups/_top_section.html.haml
  • A app/views/admin/field_groups/create.js.rjs
  • A app/views/admin/field_groups/edit.js.rjs
  • A app/views/admin/field_groups/new.js.rjs
  • A app/views/admin/field_groups/update.js.rjs
  • A db/migrate/20111201030535_add_field_groups_klass_name.rb
  • A spec/controllers/admin/field_groups_controller_spec.rb
  • M app/assets/stylesheets/common.sass
  • M app/controllers/admin/fields_controller.rb
  • M app/helpers/application_helper.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/views/admin/fields/_edit.html.haml
  • M app/views/admin/fields/_new.html.haml
  • M app/views/admin/fields/_sidebar_index.html.haml
  • M app/views/admin/fields/_sidebar_show.html.haml
  • M app/views/admin/fields/_top_section.html.haml
  • M app/views/admin/fields/create.js.rjs
  • M app/views/admin/fields/index.html.haml
  • M app/views/admin/fields/new.js.rjs
  • M app/views/admin/fields/update.js.rjs
  • M app/views/fields/_group.html.haml
  • M app/views/fields/_groups.html.haml
  • M config/locales/en-US_fat_free_crm.yml
  • M config/routes.rb
  • M db/schema.rb
  • M lib/fat_free_crm/fields.rb
  • M spec/factories/field_factories.rb
  • M spec/models/custom_field_spec.rb
  • M spec/routing/accounts_routing_spec.rb
  • M spec/routing/campaigns_routing_spec.rb
  • M spec/routing/contacts_routing_spec.rb
  • M spec/routing/leads_routing_spec.rb
  • M spec/routing/opportunities_routing_spec.rb
  • M spec/routing/tasks_routing_spec.rb
  • M spec/routing/users_routing_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