Changeset [3e928bf2d3cc56fa349f212ad74057dbf9c6f694] by Steve Kenworthy

March 11th, 2015 @ 02:08 AM

Merge branch 'issue-271' of https://github.com/unijewski/fat_free_crm into unijewski-issue-271

Conflicts:
app/models/users/user.rb db/schema.rb https://github.com/fatfreecrm/fat_free_crm/commit/3e928bf2d3cc56fa3...

Committed by Steve Kenworthy

  • A db/migrate/20150227123054_remove_last_request_at_from_users.rb
  • M app/helpers/admin/users_helper.rb
  • M app/models/users/user.rb
  • M app/views/admin/users/_user.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 db/demo/users.yml
  • M db/schema.rb
  • M spec/factories/user_factories.rb
  • M spec/models/users/user_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