Changeset [fd9b3188725f989047c0f559728a83dbc8cc39b9] by Steve Kenworthy

July 1st, 2013 @ 09:54 PM

Merge branch 'remove_rjs'

Conflicts:
spec/features/tasks_spec.rb https://github.com/fatfreecrm/fat_free_crm/commit/fd9b3188725f98904...

Committed by Steve Kenworthy

  • A app/views/accounts/create.js.haml
  • A app/views/accounts/destroy.js.haml
  • A app/views/accounts/edit.js.haml
  • A app/views/accounts/index.js.haml
  • A app/views/accounts/new.js.haml
  • A app/views/accounts/show.js.haml
  • A app/views/accounts/update.js.haml
  • A app/views/admin/field_groups/confirm.js.haml
  • A app/views/admin/field_groups/create.js.haml
  • A app/views/admin/field_groups/destroy.js.haml
  • A app/views/admin/field_groups/edit.js.haml
  • A app/views/admin/field_groups/new.js.haml
  • A app/views/admin/field_groups/update.js.haml
  • A app/views/admin/fields/create.js.haml
  • A app/views/admin/fields/destroy.js.haml
  • A app/views/admin/fields/edit.js.haml
  • A app/views/admin/fields/update.js.haml
  • A app/views/admin/groups/create.js.haml
  • A app/views/admin/groups/destroy.js.haml
  • A app/views/admin/groups/edit.js.haml
  • A app/views/admin/groups/index.js.haml
  • A app/views/admin/groups/new.js.haml
  • A app/views/admin/groups/update.js.haml
  • A app/views/admin/tags/confirm.js.haml
  • A app/views/admin/tags/create.js.haml
  • A app/views/admin/tags/destroy.js.haml
  • A app/views/admin/tags/edit.js.haml
  • A app/views/admin/tags/new.js.haml
  • A app/views/admin/tags/update.js.haml
  • A app/views/admin/users/confirm.js.haml
  • A app/views/admin/users/create.js.haml
  • A app/views/admin/users/destroy.js.haml
  • A app/views/admin/users/edit.js.haml
  • A app/views/admin/users/index.js.haml
  • A app/views/admin/users/new.js.haml
  • A app/views/admin/users/reactivate.js.haml
  • A app/views/admin/users/suspend.js.haml
  • A app/views/admin/users/update.js.haml
  • A app/views/campaigns/create.js.haml
  • A app/views/campaigns/destroy.js.haml
  • A app/views/campaigns/edit.js.haml
  • A app/views/campaigns/index.js.haml
  • A app/views/campaigns/new.js.haml
  • A app/views/campaigns/show.js.haml
  • A app/views/campaigns/update.js.haml
  • A app/views/comments/create.js.haml
  • A app/views/comments/destroy.js.haml
  • A app/views/comments/edit.js.haml
  • A app/views/comments/new.js.haml
  • A app/views/comments/update.js.haml
  • A app/views/contacts/create.js.haml
  • A app/views/contacts/destroy.js.haml
  • A app/views/contacts/edit.js.haml
  • A app/views/contacts/index.js.haml
  • A app/views/contacts/new.js.haml
  • A app/views/contacts/show.js.haml
  • A app/views/contacts/update.js.haml
  • A app/views/emails/destroy.js.haml
  • A app/views/entities/attach.js.haml
  • A app/views/entities/contacts.js.haml
  • A app/views/entities/discard.js.haml
  • A app/views/entities/leads.js.haml
  • A app/views/entities/opportunities.js.haml
  • A app/views/entities/subscription_update.js.haml
  • A app/views/entities/versions.js.haml
  • A app/views/fields/group.js.erb
  • A app/views/home/index.js.haml
  • A app/views/home/options.js.haml
  • A app/views/leads/convert.js.haml
  • A app/views/leads/create.js.haml
  • A app/views/leads/destroy.js.haml
  • A app/views/leads/edit.js.haml
  • A app/views/leads/index.js.haml
  • A app/views/leads/new.js.haml
  • A app/views/leads/promote.js.haml
  • A app/views/leads/reject.js.haml
  • A app/views/leads/show.js.haml
  • A app/views/leads/update.js.haml
  • A app/views/lists/create.js.haml
  • A app/views/lists/destroy.js.haml
  • A app/views/opportunities/contacts.js.haml
  • A app/views/opportunities/create.js.haml
  • A app/views/opportunities/destroy.js.haml
  • A app/views/opportunities/edit.js.haml
  • A app/views/opportunities/index.js.haml
  • A app/views/opportunities/new.js.haml
  • A app/views/opportunities/show.js.haml
  • A app/views/opportunities/update.js.haml
  • A app/views/tasks/complete.js.haml
  • A app/views/tasks/create.js.haml
  • A app/views/tasks/destroy.js.haml
  • A app/views/tasks/discard.js.haml
  • A app/views/tasks/edit.js.haml
  • A app/views/tasks/filter.js.haml
  • A app/views/tasks/new.js.haml
  • A app/views/tasks/update.js.haml
  • A app/views/users/avatar.js.haml
  • A app/views/users/change_password.js.haml
  • A app/views/users/edit.js.haml
  • A app/views/users/password.js.haml
  • A app/views/users/update.js.haml
  • A app/views/users/upload_avatar.js.haml
  • A spec/views/accounts/create.js.haml_spec.rb
  • A spec/views/accounts/destroy.js.haml_spec.rb
  • A spec/views/accounts/edit.js.haml_spec.rb
  • A spec/views/accounts/index.js.haml_spec.rb
  • A spec/views/accounts/new.js.haml_spec.rb
  • A spec/views/accounts/update.js.haml_spec.rb
  • A spec/views/admin/field_groups/create.js.haml_spec.rb
  • A spec/views/admin/field_groups/destroy.js.haml_spec.rb
  • A spec/views/admin/field_groups/edit.js.haml_spec.rb
  • A spec/views/admin/field_groups/new.js.haml_spec.rb
  • A spec/views/admin/field_groups/update.js.haml_spec.rb
  • A spec/views/admin/users/create.js.haml_spec.rb
  • A spec/views/admin/users/destroy.js.haml_spec.rb
  • A spec/views/admin/users/edit.js.haml_spec.rb
  • A spec/views/admin/users/index.haml_spec.rb
  • A spec/views/admin/users/index.js.haml_spec.rb
  • A spec/views/admin/users/new.js.haml_spec.rb
  • A spec/views/admin/users/reactivate.js.haml_spec.rb
  • A spec/views/admin/users/show.haml_spec.rb
  • A spec/views/admin/users/suspend.js.haml_spec.rb
  • A spec/views/admin/users/update.js.haml_spec.rb
  • A spec/views/campaigns/create.js.haml_spec.rb
  • A spec/views/campaigns/destroy.js.haml_spec.rb
  • A spec/views/campaigns/edit.js.haml_spec.rb
  • A spec/views/campaigns/index.js.haml_spec.rb
  • A spec/views/campaigns/new.js.haml_spec.rb
  • A spec/views/campaigns/update.js.haml_spec.rb
  • A spec/views/comments/new.js.haml_spec.rb
  • A spec/views/contacts/create.js.haml_spec.rb
  • A spec/views/contacts/destroy.js.haml_spec.rb
  • A spec/views/contacts/edit.js.haml_spec.rb
  • A spec/views/contacts/index.js.html_spec.rb
  • A spec/views/contacts/new.js.haml_spec.rb
  • A spec/views/contacts/update.js.haml_spec.rb
  • A spec/views/home/index.js.haml_spec.rb
  • A spec/views/home/options.js.haml_spec.rb
  • A spec/views/leads/convert.js.haml_spec.rb
  • A spec/views/leads/create.js.haml_spec.rb
  • A spec/views/leads/destroy.js.haml_spec.rb
  • A spec/views/leads/edit.js.haml_spec.rb
  • A spec/views/leads/index.js.haml_spec.rb
  • A spec/views/leads/new.js.haml_spec.rb
  • A spec/views/leads/promote.js.haml_spec.rb
  • A spec/views/leads/reject.js.haml_spec.rb
  • A spec/views/leads/update.js.haml_spec.rb
  • A spec/views/opportunities/create.js.haml_spec.rb
  • A spec/views/opportunities/destroy.js.haml_spec.rb
  • A spec/views/opportunities/edit.js.haml_spec.rb
  • A spec/views/opportunities/index.js.haml_spec.rb
  • A spec/views/opportunities/new.js.haml_spec.rb
  • A spec/views/opportunities/update.js.haml_spec.rb
  • A spec/views/tasks/complete.js.haml_spec.rb
  • A spec/views/tasks/create.js.haml_spec.rb
  • A spec/views/tasks/destroy.js.haml_spec.rb
  • A spec/views/tasks/edit.js.haml_spec.rb
  • A spec/views/tasks/new.js.haml_spec.rb
  • A spec/views/tasks/update.js.haml_spec.rb
  • A spec/views/users/avatar.js.haml_spec.rb
  • A spec/views/users/change_password.js.haml_spec.rb
  • A spec/views/users/edit.js.haml_spec.rb
  • A spec/views/users/password.js.haml_spec.rb
  • A spec/views/users/update.js.haml_spec.rb
  • A spec/views/users/upload_avatar.js.haml_spec.rb
  • R app/views/accounts/create.js.rjs
  • R app/views/accounts/destroy.js.rjs
  • R app/views/accounts/edit.js.rjs
  • R app/views/accounts/index.js.rjs
  • R app/views/accounts/new.js.rjs
  • R app/views/accounts/show.js.erb
  • R app/views/accounts/update.js.rjs
  • R app/views/admin/field_groups/confirm.js.rjs
  • R app/views/admin/field_groups/create.js.rjs
  • R app/views/admin/field_groups/destroy.js.rjs
  • R app/views/admin/field_groups/edit.js.rjs
  • R app/views/admin/field_groups/new.js.rjs
  • R app/views/admin/field_groups/update.js.rjs
  • R app/views/admin/fields/create.js.erb
  • R app/views/admin/fields/destroy.js.erb
  • R app/views/admin/fields/edit.js.erb
  • R app/views/admin/fields/update.js.erb
  • R app/views/admin/groups/create.js.rjs
  • R app/views/admin/groups/destroy.js.rjs
  • R app/views/admin/groups/edit.js.rjs
  • R app/views/admin/groups/index.js.rjs
  • R app/views/admin/groups/new.js.rjs
  • R app/views/admin/groups/update.js.rjs
  • R app/views/admin/tags/confirm.js.rjs
  • R app/views/admin/tags/create.js.rjs
  • R app/views/admin/tags/destroy.js.rjs
  • R app/views/admin/tags/edit.js.rjs
  • R app/views/admin/tags/new.js.rjs
  • R app/views/admin/tags/update.js.rjs
  • R app/views/admin/users/confirm.js.rjs
  • R app/views/admin/users/create.js.rjs
  • R app/views/admin/users/destroy.js.rjs
  • R app/views/admin/users/edit.js.rjs
  • R app/views/admin/users/index.js.rjs
  • R app/views/admin/users/new.js.rjs
  • R app/views/admin/users/reactivate.js.rjs
  • R app/views/admin/users/suspend.js.rjs
  • R app/views/admin/users/update.js.rjs
  • R app/views/campaigns/create.js.rjs
  • R app/views/campaigns/destroy.js.rjs
  • R app/views/campaigns/edit.js.rjs
  • R app/views/campaigns/index.js.rjs
  • R app/views/campaigns/new.js.rjs
  • R app/views/campaigns/show.js.erb
  • R app/views/campaigns/update.js.rjs
  • R app/views/comments/create.js.rjs
  • R app/views/comments/destroy.js.rjs
  • R app/views/comments/edit.js.rjs
  • R app/views/comments/new.js.rjs
  • R app/views/comments/update.js.rjs
  • R app/views/contacts/create.js.rjs
  • R app/views/contacts/destroy.js.rjs
  • R app/views/contacts/edit.js.rjs
  • R app/views/contacts/index.js.rjs
  • R app/views/contacts/new.js.rjs
  • R app/views/contacts/show.js.erb
  • R app/views/contacts/update.js.rjs
  • R app/views/emails/destroy.js.rjs
  • R app/views/entities/attach.js.rjs
  • R app/views/entities/contacts.js.rjs
  • R app/views/entities/discard.js.rjs
  • R app/views/entities/leads.js.rjs
  • R app/views/entities/opportunities.js.rjs
  • R app/views/entities/subscription_update.js.rjs
  • R app/views/entities/versions.js.erb
  • R app/views/fields/group.js.rjs
  • R app/views/home/index.js.rjs
  • R app/views/home/options.js.rjs
  • R app/views/leads/convert.js.rjs
  • R app/views/leads/create.js.rjs
  • R app/views/leads/destroy.js.rjs
  • R app/views/leads/edit.js.rjs
  • R app/views/leads/index.js.rjs
  • R app/views/leads/new.js.rjs
  • R app/views/leads/promote.js.rjs
  • R app/views/leads/reject.js.rjs
  • R app/views/leads/show.js.erb
  • R app/views/leads/update.js.rjs
  • R app/views/lists/create.js.rjs
  • R app/views/lists/destroy.js.rjs
  • R app/views/opportunities/contacts.js.rjs
  • R app/views/opportunities/create.js.rjs
  • R app/views/opportunities/destroy.js.rjs
  • R app/views/opportunities/edit.js.rjs
  • R app/views/opportunities/index.js.rjs
  • R app/views/opportunities/new.js.rjs
  • R app/views/opportunities/show.js.erb
  • R app/views/opportunities/update.js.rjs
  • R app/views/tasks/complete.js.rjs
  • R app/views/tasks/create.js.rjs
  • R app/views/tasks/destroy.js.rjs
  • R app/views/tasks/discard.rjs
  • R app/views/tasks/edit.js.rjs
  • R app/views/tasks/filter.js.rjs
  • R app/views/tasks/new.js.rjs
  • R app/views/tasks/update.js.rjs
  • R app/views/users/avatar.js.rjs
  • R app/views/users/change_password.js.rjs
  • R app/views/users/edit.js.rjs
  • R app/views/users/password.js.rjs
  • R app/views/users/update.js.rjs
  • R app/views/users/upload_avatar.js.rjs
  • R spec/support/rjs_support.rb
  • R spec/views/accounts/create.rjs_spec.rb
  • R spec/views/accounts/destroy.rjs_spec.rb
  • R spec/views/accounts/edit.rjs_spec.rb
  • R spec/views/accounts/index.rjs_spec.rb
  • R spec/views/accounts/new.rjs_spec.rb
  • R spec/views/accounts/update.rjs_spec.rb
  • R spec/views/admin/users/create.rjs_spec.rb
  • R spec/views/admin/users/destroy.rjs_spec.rb
  • R spec/views/admin/users/edit.rjs_spec.rb
  • R spec/views/admin/users/index.haml_spec.rb
  • R spec/views/admin/users/index.rjs_spec.rb
  • R spec/views/admin/users/new.rjs_spec.rb
  • R spec/views/admin/users/reactivate.rjs_spec.rb
  • R spec/views/admin/users/show.haml_spec.rb
  • R spec/views/admin/users/suspend.rjs_spec.rb
  • R spec/views/admin/users/update.rjs_spec.rb
  • R spec/views/campaigns/create.rjs_spec.rb
  • R spec/views/campaigns/destroy.rjs_spec.rb
  • R spec/views/campaigns/edit.rjs_spec.rb
  • R spec/views/campaigns/index.rjs_spec.rb
  • R spec/views/campaigns/new.rjs_spec.rb
  • R spec/views/campaigns/update.rjs_spec.rb
  • R spec/views/comments/new.rjs_spec.rb
  • R spec/views/contacts/create.rjs_spec.rb
  • R spec/views/contacts/destroy.rjs_spec.rb
  • R spec/views/contacts/edit.rjs_spec.rb
  • R spec/views/contacts/index.rjs_spec.rb
  • R spec/views/contacts/new.rjs_spec.rb
  • R spec/views/contacts/update.rjs_spec.rb
  • R spec/views/home/index.rjs_spec.rb
  • R spec/views/home/options.rjs_spec.rb
  • R spec/views/leads/convert.rjs_spec.rb
  • R spec/views/leads/create.rjs_spec.rb
  • R spec/views/leads/destroy.rjs_spec.rb
  • R spec/views/leads/edit.rjs_spec.rb
  • R spec/views/leads/index.rjs_spec.rb
  • R spec/views/leads/new.rjs_spec.rb
  • R spec/views/leads/promote.rjs_spec.rb
  • R spec/views/leads/reject.rjs_spec.rb
  • R spec/views/leads/update.rjs_spec.rb
  • R spec/views/opportunities/create.rjs_spec.rb
  • R spec/views/opportunities/destroy.rjs_spec.rb
  • R spec/views/opportunities/edit.rjs_spec.rb
  • R spec/views/opportunities/index.rjs_spec.rb
  • R spec/views/opportunities/new.rjs_spec.rb
  • R spec/views/opportunities/update.rjs_spec.rb
  • R spec/views/tasks/complete.rjs_spec.rb
  • R spec/views/tasks/create.rjs_spec.rb
  • R spec/views/tasks/destroy.rjs_spec.rb
  • R spec/views/tasks/edit.rjs_spec.rb
  • R spec/views/tasks/new.rjs_spec.rb
  • R spec/views/tasks/update.rjs_spec.rb
  • R spec/views/users/avatar.rjs_spec.rb
  • R spec/views/users/change_password.rjs_spec.rb
  • R spec/views/users/edit.rjs_spec.rb
  • R spec/views/users/password.rjs_spec.rb
  • R spec/views/users/update.rjs_spec.rb
  • R spec/views/users/upload_avatar.rjs_spec.rb
  • M app/assets/javascripts/admin/fields.js.coffee
  • M app/controllers/admin/fields_controller.rb
  • M app/controllers/admin/users_controller.rb
  • M app/controllers/entities/accounts_controller.rb
  • M app/controllers/entities/campaigns_controller.rb
  • M app/controllers/entities/contacts_controller.rb
  • M app/controllers/entities/leads_controller.rb
  • M app/controllers/entities/opportunities_controller.rb
  • M app/controllers/entities_controller.rb
  • M app/controllers/home_controller.rb
  • M app/controllers/tasks_controller.rb
  • M app/helpers/admin/application_helper.rb
  • M app/helpers/admin/field_groups_helper.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/leads_helper.rb
  • M app/helpers/tasks_helper.rb
  • M app/models/fields/field_group.rb
  • M app/models/polymorphic/task.rb
  • M app/views/accounts/_edit.html.haml
  • M app/views/accounts/_new.html.haml
  • M app/views/admin/field_groups/_edit.html.haml
  • M app/views/admin/field_groups/_new.html.haml
  • M app/views/admin/fields/_field.html.haml
  • M app/views/admin/fields/_form.html.haml
  • M app/views/admin/groups/_edit.html.haml
  • M app/views/admin/groups/_new.html.haml
  • M app/views/admin/groups/index.html.haml
  • M app/views/admin/tags/_edit.html.haml
  • M app/views/admin/tags/_new.html.haml
  • M app/views/admin/users/_edit.html.haml
  • M app/views/admin/users/_new.html.haml
  • M app/views/authentications/new.html.haml
  • M app/views/campaigns/_edit.html.haml
  • M app/views/campaigns/_new.html.haml
  • M app/views/contacts/_edit.html.haml
  • M app/views/contacts/_new.html.haml
  • M app/views/leads/_convert.html.haml
  • M app/views/leads/_edit.html.haml
  • M app/views/leads/_new.html.haml
  • M app/views/lists/_sidebar.html.haml
  • M app/views/opportunities/_edit.html.haml
  • M app/views/opportunities/_new.html.haml
  • M app/views/passwords/edit.html.haml
  • M app/views/passwords/new.html.haml
  • M app/views/tasks/_edit.html.haml
  • M app/views/tasks/_new.html.haml
  • M app/views/users/_password.html.haml
  • M app/views/users/_profile.html.haml
  • M app/views/users/new.html.haml
  • M spec/features/support/selector_helpers.rb
  • M spec/features/tasks_spec.rb
  • M spec/views/accounts/_edit.haml_spec.rb
  • M spec/views/accounts/show.haml_spec.rb
  • M spec/views/admin/users/_create.haml_spec.rb
  • M spec/views/contacts/index.haml_spec.rb
  • M spec/views/tasks/_edit.haml_spec.rb
  • M spec/views/tasks/index.haml_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