fat_free_crm 0.11.4 → 0.12.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjYzZTU1ZTMxNGUyNGI2M2FkNjExNjdlOTI0MDZjYzg0YmM5NTE5MA==
+  data.tar.gz: !binary |-
+    YjM0ZjE0ZDhjNjQxMTIxYmZjZTJiY2MyMzE3ZDA2MjRlYmU2ZDdlMg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OGY4M2Y1ZjQ4NGZkMDRhNWRiMTlmMTc2MjM5YWJhMmRlOWNlN2E1MjU1Njg2
+    YWZkNzU3ZmVlNDUxMmIxMGRmYmYxYTA1NGU2NzI0MDIyZjZkNzQ3NDYwZDBk
+    ZWYwMjE2NWIxYzgwYjhiZWM5MjYwYjMzYjNjZDkyYjBmNDY4NWQ=
+  data.tar.gz: !binary |-
+    Yzc4OTkwOTgyOWI1NjNkODc4MzY5YjVjODc3MWJjZDhjM2M4YTBjOWMwZjMy
+    ZjdiZWYzNjU2YjM1YWM3YjkzYzgxZDUxMjZiYjgwNjM4NmQ2MmFiYzBlNWMx
+    MzAwMTllYTRjNmJlNmRmYjI1NzY4YWNkZjhhZjcxMGMwYWM2ODc=

data/.gitignore

@@ -27,8 +27,9 @@ Design
 .idea/
 .DS_Store
 .rvmrc
+.ruby-version
+.ruby-gemset
 .sass-cache
 *~
 *.swp
 *.gem
-

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 1.9.2
-  - 1.8.7
 
 env:
   - DB=mysql
@@ -11,38 +10,32 @@ env:
 
 gemfile: Gemfile.ci
 
-# Only run a cross-section of 4 builds.
+# Only run a cross-section of 4 builds majoring on r1.9.3
 matrix:
   exclude:
-    - rvm: 1.8.7
-      env: DB=postgres
-      gemfile: Gemfile.ci
-    - rvm: 1.8.7
-      env: DB=sqlite
-      gemfile: Gemfile.ci
     - rvm: 1.9.2
       env: DB=sqlite
       gemfile: Gemfile.ci
-    - rvm: 1.9.3
-      env: DB=sqlite
-      gemfile: Gemfile.ci
-    - rvm: 1.9.3
-      env: DB=mysql
+    - rvm: 1.9.2
+      env: DB=postgres
       gemfile: Gemfile.ci
 
 bundler_args: --path=vendor/bundle --without heroku
 
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
 before_script:
   - sh -c "cp config/database.$DB.yml config/database.yml"
   - sh -c "if [ \"$DB\" = 'postgres' ]; then psql -c 'create database fat_free_crm_test;' -U postgres; fi"
   - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql -e 'create database fat_free_crm_test;'; fi"
-  - "export DISPLAY=:99"
-  - "sh -e /etc/init.d/xvfb start"
 
+# Run specs
+script: "bundle exec rake"
 # Run specs & acceptance tests, and ensure that assets can compile without errors
-script: "bundle exec rake && RAILS_ENV=production bundle exec rake assets:precompile:primary"
+# script: "bundle exec rake && RAILS_ENV=production bundle exec rake assets:precompile:primary"
 
 # To stop Travis from running tests for a new commit,
 # add the following to your commit message: [ci skip]
 # You should add this when you edit documentation or comments, etc.
-

data/CHANGELOG

@@ -4,10 +4,63 @@ It does not matter how slowly you go as long as you do not stop.
 First they ignore you, then they laugh at you, then they fight you,
 then you win. –- Mahatma Gandhi
 
-Sat, Dec 29, 2012
----------------------------------------------------------------------
-- A lot has happened in the last 2 years!
+Fri, Jun 28, 2013 (0.12.0)
+---------------------------------------------------------------------
+- Ruby 1.9 support only (no ruby 1.8 and not yet ruby 2)
+- Fixed version pagination bug thanks to reubenjs
+- Can set default stage for opportunities
+- First name can now be optional on leads, contacts and accounts (if desired)
+- Number of search results is now displayed
+- Fixed pagination ordering when displaying entities that belong to a master entity (e.g. opportunities inside a contact)
+- Fixed tests
+- Fixed avatar upload bug (by updating paperclip gem)
+- Can now search for campaigns in opportunities advanced search
+- Added ActiveSupport lazy load hooks for cleaner plugin integration
+- Fixed bug where MS Smartquotes broke the dropbox (Thanks bitgangsta)
+- Updated German translations (thanks Phillip Ullmann)
+- Display relationship between contact and it's corresponding lead in the sidebar (thanks Phillip Ullmann)
+
+Tue, Mar 16, 2013
+---------------------------------------------------------------------
+- Changed Fat Free CRM license to MIT, see MIT-LICENSE file.
+
+Sat, Dec 29, 2012 (0.11.4)
+---------------------------------------------------------------------
+- Updated countries list
+-   Please see an important fix for country data: https://github.com/fatfreecrm/fat_free_crm/wiki/The-Countries-Problem-and-How-to-Fix-It
 - 0.11.4 will be the last ruby 1.8 release
+- Comments can be added when items are created
+- Dashboard shows assigned accounts and opportunities
+- Now uses Rails 3.2
+- Added Group tab in admin section
+- Added jQuery datepicker
+- Custom fields are now included in XLS export
+- Updated Chinese translations
+- Added Ransack / RansackUI search
+- Added a Team tab to the interface
+- Added ability to add new item views via plugins
+-
+
+Wed, May 9, 2012 (0.11.2)
+---------------------------------------------------------------------
+- Better html email parsing
+- Users can subscribe to contacts/accounts etc
+- Use CanCan for permissions
+- Add jQuery UI
+- German translation updates
+
+Fri, Mar 30, 2012 (0.11.1)
+---------------------------------------------------------------------
+- Added Travis continuous integration service
+- Rails 3 compatibility
+- Added a few view hooks
+- Dropbox now understands alt_email
+- Updated translation file format
+- Export includes full_name where applicable
+- CSS bug fixes
+- Swedish & Italian translations
+- Controllers respond to JSON requests
+- Several hundred other commits...
 
 Tue, Sep 7, 2010
 ---------------------------------------------------------------------
@@ -1088,7 +1141,7 @@ Fri, Apr 24, 2009
 - Happy birthday -- we're 5 month old ;-)
 - Make sure tasks don't get onto recently viewed items list.
 - Added "completed", "reassigned", and "rescheduled" activity logs for tasks (closes LH #17).
- 
+
 Thu, Apr 23, 2009
 ---------------------------------------------------------------------
 - Filter activities based on asset permissions, even for deleted assets.

data/CONTRIBUTORS

@@ -15,6 +15,8 @@ translations to the Fat Free CRM:
   * Chris Carter
   * Codemis
   * Craig Ulliott (USA)
+  * Daniel Jabbour (USA)
+  * Daniel O'Connor
   * David Cornu
   * David Keita
   * Dirk Kelly (Australia)
@@ -34,6 +36,7 @@ translations to the Fat Free CRM:
   * Hamish Rickerby (United Kingdom)
   * Jack Tang (China)
   * James Zhang (China)
+  * Jan Schulz-Hofen
   * Jim Gay (USA)
   * Josef Chmel
   * Jose Luis Gordo Romero (Spain)
@@ -53,15 +56,14 @@ translations to the Fat Free CRM:
   * Masaki Muranaka
   * Matt Beedle (Spain)
   * Mauro Alloro
-  * Michael Dvorkin
-  * Mike Dvorkin
+  * Michael Dvorkin (USA)
   * Miles Togoe (USA)
   * Nathan Broadbent (Hong Kong)
   * Nicholas Fine
   * Nicholas Rowe (USA)
   * Nobuhito Okada (Japan)
-  * Olmo Maldonado
-  * Patrick Mulder
+  * Olmo Maldonado (USA)
+  * Patrick Mulder (Germany)
   * Paul
   * Peter McCurdy (Canada)
   * Philipp Ullmann

data/Gemfile

@@ -1,10 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Uncomment the database that you have configured in config/database.yml
 # ----------------------------------------------------------------------
-# gem 'mysql2', '0.3.10'
+# gem 'mysql2'
 # gem 'sqlite3'
-gem 'pg', '~> 0.13.2'
+gem 'pg'
 
 # Allows easy switching between locally developed gems, and gems installed from rubygems.org
 # See README for more info at: https://github.com/ndbroadbent/bundler_local_development
@@ -43,31 +43,36 @@ remove 'fat_free_crm'
 group :development do
   gem 'thin'
   gem 'quiet_assets'
-  # Uncomment the following two gems to deploy via Capistrano
   gem 'capistrano'
   gem 'capistrano_colors'
+
+  # Use zeus and guard gems to speed up development
+  # Run 'zeus start' and 'bundle exec guard' to get going
+  unless ENV["CI"]
+    gem 'guard'
+    gem 'guard-rspec'
+    gem 'guard-rails'
+    gem 'rb-inotify', :require => false
+    gem 'rb-fsevent', :require => false
+    gem 'rb-fchange', :require => false
+  end
 end
 
 group :development, :test do
-  gem 'rspec-rails', '~> 2.9.0'
+  gem 'rspec-rails'
   gem 'headless'
-  unless ENV["CI"]
-    gem 'ruby-debug', :platform => :mri_18
-    gem 'debugger', :platform => :mri_19
-  end
-  gem 'pry-rails'
+  gem 'debugger' unless ENV["CI"]
+  gem 'pry-rails' unless ENV["CI"]
 end
 
 group :test do
-  gem 'capybara', '~> 1.1' # v2 and up is not r1.8 compatible.
+  gem 'capybara', '~> 2.0.3'
+  gem 'selenium-webdriver'
   gem 'database_cleaner'
-  gem "acts_as_fu", "~> 0.0.8"
-
-  if RUBY_VERSION.to_f >= 1.9
-    gem 'factory_girl_rails', '~> 3.0.0'
-  else
-    gem 'factory_girl_rails', '~> 1.7.0'
-  end
+  gem "acts_as_fu"
+  gem 'factory_girl_rails'
+  gem 'zeus' unless ENV["CI"]
+  gem 'coveralls', :require => false
 end
 
 group :heroku do
@@ -82,9 +87,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier',     '>= 1.0.3'
   gem 'execjs'
-  unless ENV["CI"]
-    gem 'therubyracer', :platform => :ruby
-  end
+  gem 'therubyracer', :platform => :ruby unless ENV["CI"]
 end
 
 gem 'turbo-sprockets-rails3'

data/Gemfile.lock

@@ -1,32 +1,32 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.3.3)
       rails (~> 3.0)
@@ -35,7 +35,7 @@ GEM
       activerecord
       sqlite3
     acts_as_list (0.1.6)
-    addressable (2.3.2)
+    addressable (2.3.3)
     ajax-chosen-rails (0.2.1)
       chosen-rails_ffcrm
       railties (~> 3.0)
@@ -55,20 +55,23 @@ GEM
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     capistrano_colors (0.5.5)
-    capybara (1.1.4)
+    capybara (2.0.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+      xpath (~> 1.0.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     chosen-rails_ffcrm (0.9.5)
       railties (~> 3.0)
       thor (~> 0.14)
     chronic (0.6.7)
-    cocaine (0.2.1)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.1)
+      climate_control (>= 0.0.3, < 1.0)
     coderay (1.0.6)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -77,58 +80,67 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.1)
+    colorize (0.5.8)
     columnize (0.3.6)
-    css_parser (1.2.6)
+    coveralls (0.5.7)
+      colorize
+      json
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    css_parser (1.3.4)
       addressable
-      rdoc
     daemons (1.1.9)
-    database_cleaner (0.7.2)
-    debugger (1.1.4)
+    database_cleaner (0.9.1)
+    debugger (1.5.0)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
-    debugger-linecache (1.1.1)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
-    diff-lcs (1.1.3)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.0)
+    diff-lcs (1.2.1)
     dynamic_form (1.1.4)
     email_reply_parser_ffcrm (0.5.0)
     erubis (2.7.0)
     eventmachine (1.0.0)
     execjs (1.3.1)
       multi_json (~> 1.0)
-    factory_girl (3.0.0)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (3.0.0)
-      factory_girl (~> 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
     ffaker (1.14.0)
-    ffi (1.2.0)
+    ffi (1.8.1)
+    guard (1.4.0)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rails (0.4.2)
+      guard (>= 0.2.2)
+    guard-rspec (2.5.3)
+      guard (>= 1.1)
+      rspec (~> 2.11)
     haml (3.1.7)
-    headless (0.2.2)
+    headless (1.0.1)
     highline (1.6.15)
     hike (1.2.1)
     htmlentities (4.3.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.5)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.7)
     kgio (2.7.4)
     libv8 (3.3.10.4)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mail (2.4.4)
+    listen (0.7.3)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.7.1)
-    mime-types (1.19)
-    multi_json (1.5.0)
+    mime-types (1.23)
+    multi_json (1.7.2)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -136,16 +148,17 @@ GEM
     net-ssh (2.6.1)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.6)
+    nokogiri (1.5.9)
     paper_trail (2.6.3)
       activerecord (~> 3.0)
       railties (~> 3.0)
-    paperclip (2.8.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+    paperclip (3.4.1)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.0)
       mime-types
-    pg (0.13.2)
+    pg (0.14.1)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
@@ -162,32 +175,32 @@ GEM
       pry
     quiet_assets (1.0.1)
       railties (~> 3.1)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.8)
+      railties (= 3.2.13)
     rails3-jquery-autocomplete (1.0.7)
       rails (~> 3.0)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.8.0)
-    rake (0.9.2.2)
+    rake (10.0.3)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
@@ -199,31 +212,34 @@ GEM
       activerecord (~> 3.0)
       chronic (~> 0.6.7)
       polyamorous (~> 0.5.0)
-    ransack_ui (1.0.2)
+    ransack_ui (1.1.0)
       ransack
       ransack_chronic (>= 1.1.0)
-    rbx-require-relative (0.0.9)
-    rdoc (3.12)
+    rb-fchange (0.0.6)
+      ffi
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rdoc (3.12.2)
       json (~> 1.4)
     responds_to_parent (1.1.0)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    rspec-rails (2.9.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-rails (2.13.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.9.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     rubyzip (0.9.9)
     sass (3.2.1)
     sass-rails (3.2.5)
@@ -232,35 +248,40 @@ GEM
       tilt (~> 1.3)
     select2-rails (3.2.1)
       thor (~> 0.14)
-    selenium-webdriver (2.27.2)
+    selenium-webdriver (2.32.1)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     simple_form (2.0.2)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     slop (2.4.4)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
+    sqlite3 (1.3.7)
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
     thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    thor (0.17.0)
+    tilt (1.3.6)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    turbo-sprockets-rails3 (0.1.10)
-      railties (>= 3.1.0)
+    turbo-sprockets-rails3 (0.3.6)
+      railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -270,10 +291,12 @@ GEM
       raindrops (~> 0.7)
     valium (0.5.0)
       activerecord (>= 3.0.2)
-    websocket (1.0.6)
+    websocket (1.0.7)
     will_paginate (3.0.3)
-    xpath (0.1.4)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
+    zeus (0.13.3)
+      method_source (>= 0.6.7)
 
 PLATFORMS
   ruby
@@ -281,7 +304,7 @@ PLATFORMS
 DEPENDENCIES
   acts-as-taggable-on (~> 2.3.3)
   acts_as_commentable (~> 3.0.1)
-  acts_as_fu (~> 0.0.8)
+  acts_as_fu
   acts_as_list (~> 0.1.4)
   ajax-chosen-rails (>= 0.2.1)
   authlogic (= 3.1.0)
@@ -289,37 +312,44 @@ DEPENDENCIES
   cancan
   capistrano
   capistrano_colors
-  capybara (~> 1.1)
+  capybara (~> 2.0.3)
   cocaine
   coffee-rails (~> 3.2.1)
+  coveralls
   database_cleaner
   debugger
   dynamic_form
   email_reply_parser_ffcrm
   execjs
-  factory_girl_rails (~> 3.0.0)
+  factory_girl_rails
   ffaker (>= 1.12.0)
+  guard
+  guard-rails
+  guard-rspec
   haml (~> 3)
   headless
-  jquery-rails
+  jquery-rails (~> 2.1.4)
   nokogiri
   paper_trail
-  paperclip (~> 2.8.0)
-  pg (~> 0.13.2)
+  paperclip
+  pg
   premailer
   prototype-rails
   pry-rails
   quiet_assets
-  rails (~> 3.2)
+  rails (~> 3.2.12)
   rails3-jquery-autocomplete
   ransack_ffcrm (~> 0.7.1)
-  ransack_ui (>= 1.0.2)
+  ransack_ui (>= 1.1.0)
+  rb-fchange
+  rb-fsevent
+  rb-inotify
   responds_to_parent (>= 1.1.0)
-  rspec-rails (~> 2.9.0)
-  ruby-debug
+  rspec-rails
   sass (~> 3)
   sass-rails (~> 3.2.3)
   select2-rails
+  selenium-webdriver
   simple_form (~> 2.0.1)
   therubyracer
   thin
@@ -328,3 +358,4 @@ DEPENDENCIES
   unicorn
   valium
   will_paginate (~> 3.0.2)
+  zeus