Changeset [36110f602d309502df307c834c347999929f5fff] by Steve Kenworthy

August 22nd, 2014 @ 09:05 PM

Merge branch 'task_uncompleted' of github.com:VAIRIX/fat_free_crm into VAIRIX-task_uncompleted

Conflicts:
config/locales/ru_fat_free_crm.yml spec/controllers/entities/contacts_controller_spec.rb https://github.com/fatfreecrm/fat_free_crm/commit/36110f602d309502d...

Committed by Steve Kenworthy

  • A app/views/tasks/uncomplete.js.haml
  • A spec/views/tasks/uncomplete.js.haml_spec.rb
  • M app/controllers/entities_controller.rb
  • M app/controllers/tasks_controller.rb
  • M app/helpers/tasks_helper.rb
  • M app/views/tasks/_completed.html.haml
  • M config/locales/cz_fat_free_crm.yml
  • M config/locales/de_fat_free_crm.yml
  • M config/locales/en-GB_fat_free_crm.yml
  • M config/locales/en-US_fat_free_crm.yml
  • M config/locales/es_fat_free_crm.yml
  • M config/locales/fr-CA_fat_free_crm.yml
  • M config/locales/fr_fat_free_crm.yml
  • M config/locales/it_fat_free_crm.yml
  • M config/locales/ja_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/sv-SE_fat_free_crm.yml
  • M config/locales/th_fat_free_crm.yml
  • M config/locales/zh-CN_fat_free_crm.yml
  • M config/routes.rb
  • M spec/controllers/tasks_controller_spec.rb
  • M spec/helpers/tasks_helper_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