Permalink
Commits on Sep 5, 2011
  1. Merge pull request #66 from jace/master

    Fix for auto_complete for tasks
    ndbroadbent committed Sep 5, 2011
Commits on Sep 4, 2011
  1. Fix for auto_complete with tasks.

    jace committed with Fat Free CRM Sep 4, 2011
  2. Merge pull request #65 from hiitsrob/master

    First time ever doing this - let me know if I'm doing something wrong.
    ndbroadbent committed Sep 4, 2011
Commits on Sep 1, 2011
Commits on Aug 31, 2011
  1. Use paperclip gem

    ndbroadbent committed Aug 31, 2011
  2. Fat Free CRM supports multiple databases. Just like a gem does not ch…

    …eck in it's Gemfile.lock, we should also not lock Fat Free CRM users to a specific database. If you are a developer, add Gemfile.lock to .git/info/exclude. If you are a user, configure database.yml, then run bundle install, then add Gemfile.lock to your repository.
    ndbroadbent committed Aug 31, 2011
Commits on Aug 30, 2011
Commits on Aug 17, 2011
  1. Reverse match example config files. There are a lot of plugins that a…

    …dd their config files, so a global ignore is useful.
    ndbroadbent committed Aug 17, 2011
Commits on Aug 16, 2011
  1. This is how you provide backwards compatibility for Ruby 1.8.7. Optio…

    …nal arguments to the :my scope for permissions.
    ndbroadbent committed Aug 16, 2011
  2. Revert "Made default options logic compatible with Ruby 1.8.7."

    Am not sure how to fix this to be compatible with 1.8.7
    
    This reverts commit 0c6711d.
    ndbroadbent committed Aug 16, 2011
Commits on Aug 13, 2011
  1. Made default options logic compatible with Ruby 1.8.7.

    As per github issue #50
    ndbroadbent committed Aug 13, 2011
Commits on Jul 21, 2011
Commits on Jul 20, 2011
  1. Merge branch 'rails3' into master

    Conflicts:
    	app/controllers/accounts_controller.rb
    	app/controllers/campaigns_controller.rb
    	app/controllers/contacts_controller.rb
    	app/controllers/leads_controller.rb
    	app/controllers/opportunities_controller.rb
    	app/controllers/tasks_controller.rb
    	app/models/task.rb
    	app/models/user.rb
    	app/views/accounts/_options.html.haml
    	app/views/campaigns/_options.html.haml
    	app/views/campaigns/_status.html.haml
    	app/views/comments/_comment.html.haml
    	app/views/comments/_new.html.haml
    	app/views/common/_comment.html.haml
    	app/views/contacts/_options.html.haml
    	app/views/home/_users.html.haml
    	app/views/leads/_options.html.haml
    	app/views/opportunities/_options.html.haml
    	app/views/tasks/_assigned.html.haml
    	app/views/tasks/_completed.html.haml
    	app/views/tasks/_pending.html.haml
    	app/views/tasks/_related.html.haml
    	app/views/users/_avatar.html.haml
    	config/locales/en-GB.yml
    	config/locales/en-GB_fat_free_crm.yml
    	config/locales/en-US_fat_free_crm.yml
    	config/locales/es-ES.yml
    	config/locales/es_fat_free_crm.yml
    	config/locales/fr-CA.yml
    	config/locales/fr-CA_fat_free_crm.yml
    	config/locales/fr.yml
    	config/locales/fr_fat_free_crm.yml
    	config/locales/ja.yml
    	config/locales/ja_fat_free_crm.yml
    	config/locales/pl.yml
    	config/locales/pl_fat_free_crm.yml
    	config/locales/pt-BR.yml
    	config/locales/pt-BR_fat_free_crm.yml
    	config/locales/ru.yml
    	config/locales/ru_fat_free_crm.yml
    	config/locales/sv-SE_fat_free_crm.yml
    	config/locales/th.yml
    	config/locales/th_fat_free_crm.yml
    	config/locales/zh-CN.yml
    	config/locales/zh-CN_fat_free_crm.yml
    	lib/fat_free_crm/dropbox.rb
    	lib/tasks/fat_free_crm.rake
    	spec/models/task_spec.rb
    ndbroadbent committed Jul 20, 2011