fat_free_crm 0.12.3 → 0.13.0

data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.pl.js

@@ -0,0 +1,31 @@
+// Polish
+(function() {
+  function numpf(n, s, t) {
+    // s - 2-4, 22-24, 32-34 ...
+    // t - 5-21, 25-31, ...
+    var n10 = n % 10;
+    if ( (n10 > 1) && (n10 < 5) && ( (n > 20) || (n < 10) ) ) {
+      return s;
+    } else {
+      return t;
+    }
+  }
+
+  jQuery.timeago.settings.locales['pl'] = {
+    prefixAgo: null,
+    prefixFromNow: "za",
+    suffixAgo: "temu",
+    suffixFromNow: null,
+    seconds: "mniej niż minutę",
+    minute: "minutę",
+    minutes: function(value) { return numpf(value, "%d minuty", "%d minut"); },
+    hour: "godzinę",
+    hours: function(value) { return numpf(value, "%d godziny", "%d godzin"); },
+    day: "dzień",
+    days: "%d dni",
+    month: "miesiąc",
+    months: function(value) { return numpf(value, "%d miesiące", "%d miesięcy"); },
+    year: "rok",
+    years: function(value) { return numpf(value, "%d lata", "%d lat"); }
+  };
+})();

data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.pt-BR.js

@@ -0,0 +1,18 @@
+// Brazilian Portuguese
+jQuery.timeago.settings.locales['pt-BR'] = {
+   prefixAgo: "há",
+   prefixFromNow: "em",
+   suffixAgo: null,
+   suffixFromNow: null,
+   seconds: "alguns segundos",
+   minute: "um minuto",
+   minutes: "%d minutos",
+   hour: "uma hora",
+   hours: "%d horas",
+   day: "um dia",
+   days: "%d dias",
+   month: "um mês",
+   months: "%d meses",
+   year: "um ano",
+   years: "%d anos"
+};

data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.ru.js

@@ -0,0 +1,34 @@
+// Russian
+(function() {
+  function numpf(n, f, s, t) {
+    // f - 1, 21, 31, ...
+    // s - 2-4, 22-24, 32-34 ...
+    // t - 5-20, 25-30, ...
+    var n10 = n % 10;
+    if ( (n10 == 1) && ( (n == 1) || (n > 20) ) ) {
+      return f;
+    } else if ( (n10 > 1) && (n10 < 5) && ( (n > 20) || (n < 10) ) ) {
+      return s;
+    } else {
+      return t;
+    }
+  }
+
+  jQuery.timeago.settings.locales['ru'] = {
+    prefixAgo: null,
+    prefixFromNow: "через",
+    suffixAgo: "назад",
+    suffixFromNow: null,
+    seconds: "меньше минуты",
+    minute: "минуту",
+    minutes: function(value) { return numpf(value, "%d минута", "%d минуты", "%d минут"); },
+    hour: "час",
+    hours: function(value) { return numpf(value, "%d час", "%d часа", "%d часов"); },
+    day: "день",
+    days: function(value) { return numpf(value, "%d день", "%d дня", "%d дней"); },
+    month: "месяц",
+    months: function(value) { return numpf(value, "%d месяц", "%d месяца", "%d месяцев"); },
+    year: "год",
+    years: function(value) { return numpf(value, "%d год", "%d года", "%d лет"); }
+  };
+})();

data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.sv-SE.js

@@ -0,0 +1,18 @@
+// Swedish
+jQuery.timeago.settings.locales['sv-SE'] = {
+  prefixAgo: "för",
+  prefixFromNow: "om",
+  suffixAgo: "sedan",
+  suffixFromNow: "",
+  seconds: "mindre än en minut",
+  minute: "ungefär en minut",
+  minutes: "%d minuter",
+  hour: "ungefär en timme",
+  hours: "ungefär %d timmar",
+  day: "en dag",
+  days: "%d dagar",
+  month: "ungefär en månad",
+  months: "%d månader",
+  year: "ungefär ett år",
+  years: "%d år"
+};

data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.th.js

@@ -0,0 +1,20 @@
+// Thai
+jQuery.timeago.settings.locales['th'] = {
+  prefixAgo: null,
+  prefixFromNow: null,
+  suffixAgo: "ที่แล้ว",
+  suffixFromNow: "จากตอนนี้",
+  seconds: "น้อยกว่าหนึ่งนาที",
+  minute: "ประมาณหนึ่งนาที",
+  minutes: "%d นาที",
+  hour: "ประมาณหนึ่งชั่วโมง",
+  hours: "ประมาณ %d ชั่วโมง",
+  day: "หนึ่งวัน",
+  days: "%d วัน",
+  month: "ประมาณหนึ่งเดือน",
+  months: "%d เดือน",
+  year: "ประมาณหนึ่งปี",
+  years: "%d ปี",
+  wordSeparator: "",
+  numbers: []
+};

data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.zh-CN.js

@@ -0,0 +1,20 @@
+// Simplified Chinese
+jQuery.timeago.settings.locales['zh-CN'] = {
+  prefixAgo: null,
+  prefixFromNow: "从现在开始",
+  suffixAgo: "之前",
+  suffixFromNow: null,
+  seconds: "不到 1 分钟",
+  minute: "大约 1 分钟",
+  minutes: "%d 分钟",
+  hour: "大约 1 小时",
+  hours: "大约 %d 小时",
+  day: "1 天",
+  days: "%d 天",
+  month: "大约 1 个月",
+  months: "%d 月",
+  year: "大约 1 年",
+  years: "%d 年",
+  numbers: [],
+  wordSeparator: ""
+};

data/zeus.json

@@ -1,5 +1,5 @@
 {
-  "command": "ruby -rubygems -rzeus/rails -eZeus.go",
+  "command": "ruby -rubygems -r./custom_plan -eZeus.go",
 
   "plan": {
     "boot": {
@@ -10,6 +10,7 @@
           "console": ["c"],
           "server": ["s"],
           "generate": ["g"],
+          "destroy": ["d"],
           "dbconsole": []
         },
         "test_environment": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
   name: prototype-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -59,14 +59,14 @@ dependencies:
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -101,44 +101,44 @@ dependencies:
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
@@ -185,14 +185,14 @@ dependencies:
   name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -241,154 +241,140 @@ dependencies:
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: premailer
+  name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: premailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: responds_to_parent
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails3-jquery-autocomplete
+  name: responds_to_parent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: valium
+  name: rails3-jquery-autocomplete
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ransack_ffcrm
+  name: valium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ransack_ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: ajax-chosen-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: email_reply_parser_ffcrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An open source, Ruby on Rails customer relationship management platform
@@ -419,10 +405,8 @@ files:
 - app/assets/images/asterisk.gif
 - app/assets/images/avatar.jpg
 - app/assets/images/blog.gif
-- app/assets/images/delete.png
 - app/assets/images/facebook-close.gif
 - app/assets/images/facebook.gif
-- app/assets/images/iconset_attribution.png
 - app/assets/images/info.png
 - app/assets/images/info_tiny.png
 - app/assets/images/linkedin.gif
@@ -437,6 +421,7 @@ files:
 - app/assets/javascripts/crm.js
 - app/assets/javascripts/crm_chosen.js.coffee
 - app/assets/javascripts/crm_classes.js
+- app/assets/javascripts/crm_comments.js.coffee
 - app/assets/javascripts/crm_fields.js
 - app/assets/javascripts/crm_loginout.js
 - app/assets/javascripts/crm_textarea_autocomplete.js
@@ -446,6 +431,7 @@ files:
 - app/assets/javascripts/jquery-noconflict.js
 - app/assets/javascripts/lists.js.coffee
 - app/assets/javascripts/search.js.coffee
+- app/assets/javascripts/timeago.js
 - app/assets/stylesheets/admin/fields.css.scss
 - app/assets/stylesheets/advanced_search.css.scss
 - app/assets/stylesheets/application.css.erb
@@ -562,16 +548,16 @@ files:
 - app/views/accounts/_sidebar_show.html.haml
 - app/views/accounts/_title_bar.html.haml
 - app/views/accounts/_top_section.html.haml
-- app/views/accounts/create.js.rjs
-- app/views/accounts/destroy.js.rjs
-- app/views/accounts/edit.js.rjs
+- app/views/accounts/create.js.haml
+- app/views/accounts/destroy.js.haml
+- app/views/accounts/edit.js.haml
 - app/views/accounts/index.html.haml
-- app/views/accounts/index.js.rjs
+- app/views/accounts/index.js.haml
 - app/views/accounts/index.xls.builder
-- app/views/accounts/new.js.rjs
+- app/views/accounts/new.js.haml
 - app/views/accounts/show.html.haml
-- app/views/accounts/show.js.erb
-- app/views/accounts/update.js.rjs
+- app/views/accounts/show.js.haml
+- app/views/accounts/update.js.haml
 - app/views/admin/custom_fields/_base_field.html.haml
 - app/views/admin/custom_fields/_check_boxes_field.html.haml
 - app/views/admin/custom_fields/_date_field.html.haml
@@ -586,36 +572,36 @@ files:
 - app/views/admin/field_groups/_field_group.html.haml
 - app/views/admin/field_groups/_new.html.haml
 - app/views/admin/field_groups/_top_section.html.haml
-- app/views/admin/field_groups/confirm.js.rjs
-- app/views/admin/field_groups/create.js.rjs
-- app/views/admin/field_groups/destroy.js.rjs
-- app/views/admin/field_groups/edit.js.rjs
-- app/views/admin/field_groups/new.js.rjs
-- app/views/admin/field_groups/update.js.rjs
+- app/views/admin/field_groups/confirm.js.haml
+- app/views/admin/field_groups/create.js.haml
+- app/views/admin/field_groups/destroy.js.haml
+- app/views/admin/field_groups/edit.js.haml
+- app/views/admin/field_groups/new.js.haml
+- app/views/admin/field_groups/update.js.haml
 - app/views/admin/fields/_field.html.haml
 - app/views/admin/fields/_form.html.haml
 - app/views/admin/fields/_sidebar_index.html.haml
 - app/views/admin/fields/_sidebar_show.html.haml
 - app/views/admin/fields/_sort_by.html.haml
 - app/views/admin/fields/_subform.html.haml
-- app/views/admin/fields/create.js.erb
-- app/views/admin/fields/destroy.js.erb
-- app/views/admin/fields/edit.js.erb
+- app/views/admin/fields/create.js.haml
+- app/views/admin/fields/destroy.js.haml
+- app/views/admin/fields/edit.js.haml
 - app/views/admin/fields/index.html.haml
 - app/views/admin/fields/show.html.haml
-- app/views/admin/fields/update.js.erb
+- app/views/admin/fields/update.js.haml
 - app/views/admin/groups/_edit.html.haml
 - app/views/admin/groups/_form.html.haml
 - app/views/admin/groups/_group.html.haml
 - app/views/admin/groups/_new.html.haml
-- app/views/admin/groups/create.js.rjs
-- app/views/admin/groups/destroy.js.rjs
-- app/views/admin/groups/edit.js.rjs
+- app/views/admin/groups/create.js.haml
+- app/views/admin/groups/destroy.js.haml
+- app/views/admin/groups/edit.js.haml
 - app/views/admin/groups/index.html.haml
-- app/views/admin/groups/index.js.rjs
-- app/views/admin/groups/new.js.rjs
+- app/views/admin/groups/index.js.haml
+- app/views/admin/groups/new.js.haml
 - app/views/admin/groups/show.html.haml
-- app/views/admin/groups/update.js.rjs
+- app/views/admin/groups/update.js.haml
 - app/views/admin/plugins/_plugin.html.haml
 - app/views/admin/plugins/index.html.haml
 - app/views/admin/settings/index.html.haml
@@ -624,30 +610,30 @@ files:
 - app/views/admin/tags/_new.html.haml
 - app/views/admin/tags/_tag.html.haml
 - app/views/admin/tags/_top_section.html.haml
-- app/views/admin/tags/confirm.js.rjs
-- app/views/admin/tags/create.js.rjs
-- app/views/admin/tags/destroy.js.rjs
-- app/views/admin/tags/edit.js.rjs
+- app/views/admin/tags/confirm.js.haml
+- app/views/admin/tags/create.js.haml
+- app/views/admin/tags/destroy.js.haml
+- app/views/admin/tags/edit.js.haml
 - app/views/admin/tags/index.html.haml
-- app/views/admin/tags/new.js.rjs
-- app/views/admin/tags/update.js.rjs
+- app/views/admin/tags/new.js.haml
+- app/views/admin/tags/update.js.haml
 - app/views/admin/users/_confirm.html.haml
 - app/views/admin/users/_edit.html.haml
 - app/views/admin/users/_new.html.haml
 - app/views/admin/users/_profile.html.haml
 - app/views/admin/users/_sidebar_index.html.haml
 - app/views/admin/users/_user.html.haml
-- app/views/admin/users/confirm.js.rjs
-- app/views/admin/users/create.js.rjs
-- app/views/admin/users/destroy.js.rjs
-- app/views/admin/users/edit.js.rjs
+- app/views/admin/users/confirm.js.haml
+- app/views/admin/users/create.js.haml
+- app/views/admin/users/destroy.js.haml
+- app/views/admin/users/edit.js.haml
 - app/views/admin/users/index.html.haml
-- app/views/admin/users/index.js.rjs
-- app/views/admin/users/new.js.rjs
-- app/views/admin/users/reactivate.js.rjs
+- app/views/admin/users/index.js.haml
+- app/views/admin/users/new.js.haml
+- app/views/admin/users/reactivate.js.haml
 - app/views/admin/users/show.html.haml
-- app/views/admin/users/suspend.js.rjs
-- app/views/admin/users/update.js.rjs
+- app/views/admin/users/suspend.js.haml
+- app/views/admin/users/update.js.haml
 - app/views/application/_auto_complete.html.haml
 - app/views/application/index.atom.builder
 - app/views/application/index.rss.builder
@@ -666,25 +652,24 @@ files:
 - app/views/campaigns/_status.html.haml
 - app/views/campaigns/_title_bar.html.haml
 - app/views/campaigns/_top_section.html.haml
-- app/views/campaigns/create.js.rjs
-- app/views/campaigns/destroy.js.rjs
-- app/views/campaigns/edit.js.rjs
+- app/views/campaigns/create.js.haml
+- app/views/campaigns/destroy.js.haml
+- app/views/campaigns/edit.js.haml
 - app/views/campaigns/index.html.haml
-- app/views/campaigns/index.js.rjs
+- app/views/campaigns/index.js.haml
 - app/views/campaigns/index.xls.builder
-- app/views/campaigns/new.js.rjs
+- app/views/campaigns/new.js.haml
 - app/views/campaigns/show.html.haml
-- app/views/campaigns/show.js.erb
-- app/views/campaigns/update.js.rjs
+- app/views/campaigns/show.js.haml
+- app/views/campaigns/update.js.haml
 - app/views/comments/_comment.html.haml
 - app/views/comments/_edit.html.haml
 - app/views/comments/_new.html.haml
 - app/views/comments/_subscription_links.html.haml
-- app/views/comments/create.js.rjs
-- app/views/comments/destroy.js.rjs
-- app/views/comments/edit.js.rjs
-- app/views/comments/new.js.rjs
-- app/views/comments/update.js.rjs
+- app/views/comments/create.js.haml
+- app/views/comments/destroy.js.haml
+- app/views/comments/edit.js.haml
+- app/views/comments/update.js.haml
 - app/views/contacts/_contact.html.haml
 - app/views/contacts/_contacts.html.haml
 - app/views/contacts/_edit.html.haml
@@ -700,39 +685,39 @@ files:
 - app/views/contacts/_title_bar.html.haml
 - app/views/contacts/_top_section.html.haml
 - app/views/contacts/_web.html.haml
-- app/views/contacts/create.js.rjs
-- app/views/contacts/destroy.js.rjs
-- app/views/contacts/edit.js.rjs
+- app/views/contacts/create.js.haml
+- app/views/contacts/destroy.js.haml
+- app/views/contacts/edit.js.haml
 - app/views/contacts/index.html.haml
-- app/views/contacts/index.js.rjs
+- app/views/contacts/index.js.haml
 - app/views/contacts/index.xls.builder
-- app/views/contacts/new.js.rjs
+- app/views/contacts/new.js.haml
 - app/views/contacts/show.html.haml
-- app/views/contacts/show.js.erb
-- app/views/contacts/update.js.rjs
+- app/views/contacts/show.js.haml
+- app/views/contacts/update.js.haml
 - app/views/dropbox_mailer/dropbox_notification.html.haml
 - app/views/emails/_email.html.haml
-- app/views/emails/destroy.js.rjs
+- app/views/emails/destroy.js.haml
 - app/views/entities/_basic_search.html.haml
 - app/views/entities/_permissions.html.haml
 - app/views/entities/_search.html.haml
 - app/views/entities/_section_custom_fields.html.haml
 - app/views/entities/_sort_fields.html.haml
 - app/views/entities/_title_bar.html.haml
-- app/views/entities/attach.js.rjs
-- app/views/entities/contacts.js.rjs
-- app/views/entities/discard.js.rjs
-- app/views/entities/leads.js.rjs
-- app/views/entities/opportunities.js.rjs
-- app/views/entities/subscription_update.js.rjs
-- app/views/entities/versions.js.erb
+- app/views/entities/attach.js.haml
+- app/views/entities/contacts.js.haml
+- app/views/entities/discard.js.haml
+- app/views/entities/leads.js.haml
+- app/views/entities/opportunities.js.haml
+- app/views/entities/subscription_update.js.haml
+- app/views/entities/versions.js.haml
 - app/views/fields/_edit_custom_field_group.html.haml
 - app/views/fields/_group.html.haml
 - app/views/fields/_group_table.html.haml
 - app/views/fields/_group_view.html.haml
 - app/views/fields/_groups.html.haml
 - app/views/fields/_sidebar_show.html.haml
-- app/views/fields/group.js.rjs
+- app/views/fields/group.js.erb
 - app/views/home/_account.html.haml
 - app/views/home/_activity.html.haml
 - app/views/home/_assets_menu.html.haml
@@ -744,9 +729,9 @@ files:
 - app/views/home/_users_menu.html.haml
 - app/views/home/index.atom.builder
 - app/views/home/index.html.haml
-- app/views/home/index.js.rjs
+- app/views/home/index.js.haml
 - app/views/home/index.rss.builder
-- app/views/home/options.js.rjs
+- app/views/home/options.js.haml
 - app/views/layouts/500.html.haml
 - app/views/layouts/_about.html.haml
 - app/views/layouts/_footer.html.haml
@@ -775,22 +760,23 @@ files:
 - app/views/leads/_title_bar.html.haml
 - app/views/leads/_top_section.html.haml
 - app/views/leads/_web.html.haml
-- app/views/leads/convert.js.rjs
-- app/views/leads/create.js.rjs
-- app/views/leads/destroy.js.rjs
-- app/views/leads/edit.js.rjs
+- app/views/leads/convert.js.haml
+- app/views/leads/create.js.haml
+- app/views/leads/destroy.js.haml
+- app/views/leads/edit.js.haml
 - app/views/leads/index.html.haml
-- app/views/leads/index.js.rjs
+- app/views/leads/index.js.haml
 - app/views/leads/index.xls.builder
-- app/views/leads/new.js.rjs
-- app/views/leads/promote.js.rjs
-- app/views/leads/reject.js.rjs
+- app/views/leads/new.js.haml
+- app/views/leads/promote.js.haml
+- app/views/leads/reject.js.haml
 - app/views/leads/show.html.haml
-- app/views/leads/show.js.erb
-- app/views/leads/update.js.rjs
+- app/views/leads/show.js.haml
+- app/views/leads/update.js.haml
+- app/views/lists/_personal_sidebar.html.haml
 - app/views/lists/_sidebar.html.haml
-- app/views/lists/create.js.rjs
-- app/views/lists/destroy.js.rjs
+- app/views/lists/create.js.haml
+- app/views/lists/destroy.js.haml
 - app/views/opportunities/_edit.html.haml
 - app/views/opportunities/_index_brief.html.haml
 - app/views/opportunities/_index_long.html.haml
@@ -801,17 +787,17 @@ files:
 - app/views/opportunities/_sidebar_show.html.haml
 - app/views/opportunities/_title_bar.html.haml
 - app/views/opportunities/_top_section.html.haml
-- app/views/opportunities/contacts.js.rjs
-- app/views/opportunities/create.js.rjs
-- app/views/opportunities/destroy.js.rjs
-- app/views/opportunities/edit.js.rjs
+- app/views/opportunities/contacts.js.haml
+- app/views/opportunities/create.js.haml
+- app/views/opportunities/destroy.js.haml
+- app/views/opportunities/edit.js.haml
 - app/views/opportunities/index.html.haml
-- app/views/opportunities/index.js.rjs
+- app/views/opportunities/index.js.haml
 - app/views/opportunities/index.xls.builder
-- app/views/opportunities/new.js.rjs
+- app/views/opportunities/new.js.haml
 - app/views/opportunities/show.html.haml
-- app/views/opportunities/show.js.erb
-- app/views/opportunities/update.js.rjs
+- app/views/opportunities/show.js.haml
+- app/views/opportunities/update.js.haml
 - app/views/passwords/edit.html.haml
 - app/views/passwords/new.html.haml
 - app/views/shared/_add_comment.html.haml
@@ -846,16 +832,16 @@ files:
 - app/views/tasks/_tasks.html.haml
 - app/views/tasks/_title.html.haml
 - app/views/tasks/_top_section.html.haml
-- app/views/tasks/complete.js.rjs
-- app/views/tasks/create.js.rjs
-- app/views/tasks/destroy.js.rjs
-- app/views/tasks/discard.rjs
-- app/views/tasks/edit.js.rjs
-- app/views/tasks/filter.js.rjs
+- app/views/tasks/complete.js.haml
+- app/views/tasks/create.js.haml
+- app/views/tasks/destroy.js.haml
+- app/views/tasks/discard.js.haml
+- app/views/tasks/edit.js.haml
+- app/views/tasks/filter.js.haml
 - app/views/tasks/index.html.haml
 - app/views/tasks/index.xls.builder
-- app/views/tasks/new.js.rjs
-- app/views/tasks/update.js.rjs
+- app/views/tasks/new.js.haml
+- app/views/tasks/update.js.haml
 - app/views/user_mailer/assigned_entity_notification.html.haml
 - app/views/user_mailer/password_reset_instructions.html.haml
 - app/views/users/_avatar.html.haml
@@ -864,16 +850,16 @@ files:
 - app/views/users/_profile.html.haml
 - app/views/users/_user.html.haml
 - app/views/users/_user_report.html.haml
-- app/views/users/avatar.js.rjs
-- app/views/users/change_password.js.rjs
-- app/views/users/edit.js.rjs
+- app/views/users/avatar.js.haml
+- app/views/users/change_password.js.haml
+- app/views/users/edit.js.haml
 - app/views/users/index.html.haml
 - app/views/users/new.html.haml
 - app/views/users/opportunities_overview.html.haml
-- app/views/users/password.js.rjs
+- app/views/users/password.js.haml
 - app/views/users/show.html.haml
-- app/views/users/update.js.rjs
-- app/views/users/upload_avatar.js.rjs
+- app/views/users/update.js.haml
+- app/views/users/upload_avatar.js.haml
 - app/views/versions/_version.html.haml
 - app/views/versions/_version_item.html.haml
 - app/views/versions/_versions.html.haml
@@ -893,6 +879,7 @@ files:
 - config/initializers/action_mailer.rb
 - config/initializers/authlogic.rb
 - config/initializers/constants.rb
+- config/initializers/custom_field_ransack_translations.rb
 - config/initializers/gravatar.rb
 - config/initializers/locale.rb
 - config/initializers/mime_types.rb
@@ -908,6 +895,7 @@ files:
 - config/locales/cz_fat_free_crm.yml
 - config/locales/de.yml
 - config/locales/de_fat_free_crm.yml
+- config/locales/de_ransack.yml
 - config/locales/en-GB.yml
 - config/locales/en-GB_fat_free_crm.yml
 - config/locales/en-US.yml
@@ -938,6 +926,7 @@ files:
 - config/routes.rb
 - config/settings.default.yml
 - config/unicorn.rb
+- custom_plan.rb
 - db/demo/account_contacts.yml
 - db/demo/account_opportunities.yml
 - db/demo/accounts.yml
@@ -1011,6 +1000,7 @@ files:
 - db/migrate/20120801032706_add_pair_id_to_fields.rb
 - db/migrate/20121003063155_add_settings_to_custom_fields.rb
 - db/migrate/20121221033947_fix_country_mapping.rb
+- db/migrate/20131207033244_add_user_id_to_lists.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/fields.rb
@@ -1052,7 +1042,6 @@ files:
 - lib/fat_free_crm/plugin.rb
 - lib/fat_free_crm/plugin_dependencies.rb
 - lib/fat_free_crm/renderers.rb
-- lib/fat_free_crm/secret_token_generator.rb
 - lib/fat_free_crm/sortable.rb
 - lib/fat_free_crm/tabs.rb
 - lib/fat_free_crm/version.rb
@@ -1172,7 +1161,6 @@ files:
 - spec/lib/mail_processor/dropbox_spec.rb
 - spec/lib/mail_processor/sample_emails/dropbox.rb
 - spec/lib/permissions_spec.rb
-- spec/lib/secret_token_generator_spec.rb
 - spec/lib/view_factory_spec.rb
 - spec/mailers/subscription_mailer_spec.rb
 - spec/mailers/user_mailer_spec.rb
@@ -1198,7 +1186,6 @@ files:
 - spec/models/polymorphic/task_spec.rb
 - spec/models/polymorphic/version_spec.rb
 - spec/models/setting_spec.rb
-- spec/models/users/abilities/user_ability_spec.rb
 - spec/models/users/authentication_spec.rb
 - spec/models/users/group_spec.rb
 - spec/models/users/permission_spec.rb
@@ -1221,98 +1208,100 @@ files:
 - spec/support/auth_macros.rb
 - spec/support/macros.rb
 - spec/support/mail_processor_mocks.rb
-- spec/support/rjs_support.rb
 - spec/support/uploaded_file.rb
 - spec/views/accounts/_edit.haml_spec.rb
 - spec/views/accounts/_new.haml_spec.rb
-- spec/views/accounts/create.rjs_spec.rb
-- spec/views/accounts/destroy.rjs_spec.rb
-- spec/views/accounts/edit.rjs_spec.rb
+- spec/views/accounts/create.js.haml_spec.rb
+- spec/views/accounts/destroy.js.haml_spec.rb
+- spec/views/accounts/edit.js.haml_spec.rb
 - spec/views/accounts/index.haml_spec.rb
-- spec/views/accounts/index.rjs_spec.rb
-- spec/views/accounts/new.rjs_spec.rb
+- spec/views/accounts/index.js.haml_spec.rb
+- spec/views/accounts/new.js.haml_spec.rb
 - spec/views/accounts/show.haml_spec.rb
-- spec/views/accounts/update.rjs_spec.rb
+- spec/views/accounts/update.js.haml_spec.rb
+- spec/views/admin/field_groups/create.js.haml_spec.rb
+- spec/views/admin/field_groups/destroy.js.haml_spec.rb
+- spec/views/admin/field_groups/edit.js.haml_spec.rb
+- spec/views/admin/field_groups/new.js.haml_spec.rb
+- spec/views/admin/field_groups/update.js.haml_spec.rb
 - spec/views/admin/users/_create.haml_spec.rb
-- spec/views/admin/users/create.rjs_spec.rb
-- spec/views/admin/users/destroy.rjs_spec.rb
-- spec/views/admin/users/edit.rjs_spec.rb
+- spec/views/admin/users/create.js.haml_spec.rb
+- spec/views/admin/users/destroy.js.haml_spec.rb
+- spec/views/admin/users/edit.js.haml_spec.rb
 - spec/views/admin/users/index.haml_spec.rb
-- spec/views/admin/users/index.rjs_spec.rb
-- spec/views/admin/users/new.rjs_spec.rb
-- spec/views/admin/users/reactivate.rjs_spec.rb
+- spec/views/admin/users/index.js.haml_spec.rb
+- spec/views/admin/users/new.js.haml_spec.rb
+- spec/views/admin/users/reactivate.js.haml_spec.rb
 - spec/views/admin/users/show.haml_spec.rb
-- spec/views/admin/users/suspend.rjs_spec.rb
-- spec/views/admin/users/update.rjs_spec.rb
+- spec/views/admin/users/suspend.js.haml_spec.rb
+- spec/views/admin/users/update.js.haml_spec.rb
 - spec/views/application/auto_complete.haml_spec.rb
 - spec/views/authentications/new.haml_spec.rb
 - spec/views/campaigns/_edit.haml_spec.rb
 - spec/views/campaigns/_new.haml_spec.rb
-- spec/views/campaigns/create.rjs_spec.rb
-- spec/views/campaigns/destroy.rjs_spec.rb
-- spec/views/campaigns/edit.rjs_spec.rb
+- spec/views/campaigns/create.js.haml_spec.rb
+- spec/views/campaigns/destroy.js.haml_spec.rb
+- spec/views/campaigns/edit.js.haml_spec.rb
 - spec/views/campaigns/index.haml_spec.rb
-- spec/views/campaigns/index.rjs_spec.rb
-- spec/views/campaigns/new.rjs_spec.rb
+- spec/views/campaigns/index.js.haml_spec.rb
+- spec/views/campaigns/new.js.haml_spec.rb
 - spec/views/campaigns/show.haml_spec.rb
-- spec/views/campaigns/update.rjs_spec.rb
-- spec/views/comments/new.rjs_spec.rb
+- spec/views/campaigns/update.js.haml_spec.rb
+- spec/views/comments/edit.js.haml_spec.rb
 - spec/views/contacts/_edit.haml_spec.rb
 - spec/views/contacts/_new.haml_spec.rb
-- spec/views/contacts/create.rjs_spec.rb
-- spec/views/contacts/destroy.rjs_spec.rb
-- spec/views/contacts/edit.rjs_spec.rb
+- spec/views/contacts/create.js.haml_spec.rb
+- spec/views/contacts/destroy.js.haml_spec.rb
+- spec/views/contacts/edit.js.haml_spec.rb
 - spec/views/contacts/index.haml_spec.rb
-- spec/views/contacts/index.rjs_spec.rb
-- spec/views/contacts/new.rjs_spec.rb
+- spec/views/contacts/index.js.html_spec.rb
+- spec/views/contacts/new.js.haml_spec.rb
 - spec/views/contacts/show.haml_spec.rb
-- spec/views/contacts/update.rjs_spec.rb
+- spec/views/contacts/update.js.haml_spec.rb
 - spec/views/home/index.haml_spec.rb
-- spec/views/home/index.rjs_spec.rb
-- spec/views/home/options.rjs_spec.rb
+- spec/views/home/index.js.haml_spec.rb
+- spec/views/home/options.js.haml_spec.rb
 - spec/views/leads/_convert.haml_spec.rb
 - spec/views/leads/_edit.haml_spec.rb
 - spec/views/leads/_new.haml_spec.rb
 - spec/views/leads/_sidebar_show.haml_spec.rb
-- spec/views/leads/convert.rjs_spec.rb
-- spec/views/leads/create.rjs_spec.rb
-- spec/views/leads/destroy.rjs_spec.rb
-- spec/views/leads/edit.rjs_spec.rb
+- spec/views/leads/convert.js.haml_spec.rb
+- spec/views/leads/create.js.haml_spec.rb
+- spec/views/leads/destroy.js.haml_spec.rb
+- spec/views/leads/edit.js.haml_spec.rb
 - spec/views/leads/index.haml_spec.rb
-- spec/views/leads/index.rjs_spec.rb
-- spec/views/leads/new.rjs_spec.rb
-- spec/views/leads/promote.rjs_spec.rb
-- spec/views/leads/reject.rjs_spec.rb
+- spec/views/leads/index.js.haml_spec.rb
+- spec/views/leads/new.js.haml_spec.rb
+- spec/views/leads/promote.js.haml_spec.rb
+- spec/views/leads/reject.js.haml_spec.rb
 - spec/views/leads/show.haml_spec.rb
-- spec/views/leads/update.rjs_spec.rb
+- spec/views/leads/update.js.haml_spec.rb
 - spec/views/opportunities/_edit.haml_spec.rb
 - spec/views/opportunities/_new.haml_spec.rb
-- spec/views/opportunities/create.rjs_spec.rb
-- spec/views/opportunities/destroy.rjs_spec.rb
-- spec/views/opportunities/edit.rjs_spec.rb
+- spec/views/opportunities/create.js.haml_spec.rb
+- spec/views/opportunities/destroy.js.haml_spec.rb
+- spec/views/opportunities/edit.js.haml_spec.rb
 - spec/views/opportunities/index.haml_spec.rb
-- spec/views/opportunities/index.rjs_spec.rb
-- spec/views/opportunities/new.rjs_spec.rb
+- spec/views/opportunities/index.js.haml_spec.rb
+- spec/views/opportunities/new.js.haml_spec.rb
 - spec/views/opportunities/show.haml_spec.rb
-- spec/views/opportunities/update.rjs_spec.rb
+- spec/views/opportunities/update.js.haml_spec.rb
 - spec/views/tasks/_edit.haml_spec.rb
-- spec/views/tasks/complete.rjs_spec.rb
-- spec/views/tasks/create.rjs_spec.rb
-- spec/views/tasks/destroy.rjs_spec.rb
-- spec/views/tasks/edit.rjs_spec.rb
+- spec/views/tasks/complete.js.haml_spec.rb
+- spec/views/tasks/create.js.haml_spec.rb
+- spec/views/tasks/destroy.js.haml_spec.rb
+- spec/views/tasks/edit.js.haml_spec.rb
 - spec/views/tasks/index.haml_spec.rb
-- spec/views/tasks/new.rjs_spec.rb
-- spec/views/tasks/update.rjs_spec.rb
-- spec/views/users/avatar.rjs_spec.rb
-- spec/views/users/change_password.rjs_spec.rb
-- spec/views/users/edit.rjs_spec.rb
-- spec/views/users/password.rjs_spec.rb
-- spec/views/users/update.rjs_spec.rb
-- spec/views/users/upload_avatar.rjs_spec.rb
-- vendor/assets/images/brief.png
+- spec/views/tasks/new.js.haml_spec.rb
+- spec/views/tasks/update.js.haml_spec.rb
+- spec/views/users/avatar.js.haml_spec.rb
+- spec/views/users/change_password.js.haml_spec.rb
+- spec/views/users/edit.js.haml_spec.rb
+- spec/views/users/password.js.haml_spec.rb
+- spec/views/users/update.js.haml_spec.rb
+- spec/views/users/upload_avatar.js.haml_spec.rb
 - vendor/assets/images/calendar_date_select/calendar.gif
 - vendor/assets/images/chosen-sprite.png
-- vendor/assets/images/full.png
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png
 - vendor/assets/images/jquery-ui/ui-bg_flat_100_ffffff_40x100.png
@@ -1325,21 +1314,10 @@ files:
 - vendor/assets/images/jquery-ui/ui-icons_466bb1_256x240.png
 - vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png
 - vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png
-- vendor/assets/images/long.png
-- vendor/assets/images/tab_icons/accounts.png
-- vendor/assets/images/tab_icons/accounts_active.png
-- vendor/assets/images/tab_icons/campaigns.png
-- vendor/assets/images/tab_icons/campaigns_active.png
-- vendor/assets/images/tab_icons/contacts.png
-- vendor/assets/images/tab_icons/contacts_active.png
-- vendor/assets/images/tab_icons/dashboard.png
-- vendor/assets/images/tab_icons/dashboard_active.png
-- vendor/assets/images/tab_icons/leads.png
-- vendor/assets/images/tab_icons/leads_active.png
-- vendor/assets/images/tab_icons/opportunities.png
-- vendor/assets/images/tab_icons/opportunities_active.png
-- vendor/assets/images/tab_icons/tasks.png
-- vendor/assets/images/tab_icons/tasks_active.png
+- vendor/assets/javascripts/ajax-chosen-jquery.js
+- vendor/assets/javascripts/ajax-chosen-prototype.js
+- vendor/assets/javascripts/ajax-chosen.jquery.coffee
+- vendor/assets/javascripts/ajax-chosen.proto.coffee
 - vendor/assets/javascripts/chosen-jquery.js
 - vendor/assets/javascripts/chosen-prototype.js
 - vendor/assets/javascripts/chosen.jquery.coffee
@@ -1348,6 +1326,23 @@ files:
 - vendor/assets/javascripts/facebooklist.js
 - vendor/assets/javascripts/facebooklist.simulate.js
 - vendor/assets/javascripts/jquery.disable.js
+- vendor/assets/javascripts/jquery_timeago/index.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.cz.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.de.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.en-GB.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.en-US.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.es.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.fr-CA.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.fr.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.it.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.ja.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.pl.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.pt-BR.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.ru.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.sv-SE.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.th.js
+- vendor/assets/javascripts/jquery_timeago/jquery.timeago.zh-CN.js
 - vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-addon.js
 - vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-af.js
 - vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-ca.js
@@ -1412,12 +1407,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []