Merge branch 'master' into welcome-email-organization-user

Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-ruby '2.3.5'
 
 gem 'ancestry', '~> 2.1.0'
 gem 'cancancan', '~> 1.13.1'
@@ -12,6 +11,7 @@ gem 'foundation-rails', '= 5.5.1.0'
 gem 'friendly_id', '~> 5.1.0'
 gem 'i18n_data', '~> 0.7.0'
 gem 'initialjs-rails', '0.2.0.1'
+gem 'invisible_captcha', '~> 0.9.2'
 gem 'jbuilder', '~> 2.0'
 gem 'jquery-rails', '~> 4.0.5'
 gem 'jquery-ui-rails', '~> 5.0.5'
@@ -36,6 +36,7 @@ gem 'tinymce-rails', '~> 4.2.6'
 gem 'tinymce-rails-langs', '~> 4.20140129'
 gem 'turbolinks', '~> 2.5.3'
 gem 'uglifier', '>= 1.3.0'
+gem 'rails4-autocomplete'
 
 group :development do
   gem 'better_errors', '~> 2.1.1'
@@ -45,6 +46,7 @@ group :development do
   gem 'capistrano-rails-console', require: false
   gem 'capistrano-rvm', '~> 0.1.1', require: false
   gem 'jazz_hands', :git => 'https://github.com/nixme/jazz_hands.git', branch: 'bring-your-own-debugger'
+  gem 'letter_opener_web', '~> 1.3.1'
   gem 'quiet_assets', '~> 1.1.0'
   gem 'rails_layout', '~> 1.0.26'
   gem 'spring-commands-rspec', '~> 1.0.4'
@@ -63,6 +65,7 @@ end
 
 group :test do
   gem 'capybara', '~> 2.5.0'
+  gem 'capybara-email', '~> 2.5.0'
   gem 'coveralls', require: false
   gem 'database_cleaner', '~> 1.5.0'
   gem 'launchy', '~> 2.4.3'

Gemfile.lock

@@ -95,6 +95,9 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    capybara-email (2.5.0)
+      capybara (~> 2.4)
+      mail
     climate_control (0.2.0)
     cliver (0.3.2)
     cocaine (0.5.8)
@@ -171,6 +174,8 @@ GEM
     i18n_data (0.7.0)
     initialjs-rails (0.2.0.1)
       railties (>= 3.1, < 5.0)
+    invisible_captcha (0.9.3)
+      rails (>= 3.2.0)
     jbuilder (2.3.2)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
@@ -199,6 +204,12 @@ GEM
     kgio (2.10.0)
     launchy (2.4.3)
       addressable (~> 2.3)
+    letter_opener (1.4.1)
+      launchy (~> 2.2)
+    letter_opener_web (1.3.1)
+      actionmailer (>= 3.2)
+      letter_opener (~> 1.0)
+      railties (>= 3.2)
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -283,15 +294,17 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)
+    rails4-autocomplete (1.1.1)
+      rails (>= 3.0)
     rails_layout (1.0.41)
     railties (4.2.10)
       actionpack (= 4.2.10)
@@ -440,7 +453,7 @@ GEM
     websocket-extensions (0.1.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.7.6)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
@@ -457,6 +470,7 @@ DEPENDENCIES
   capistrano-rails-console
   capistrano-rvm (~> 0.1.1)
   capybara (~> 2.5.0)
+  capybara-email (~> 2.5.0)
   cocoon (~> 1.2.6)
   coffee-rails (~> 4.1.0)
   coveralls
@@ -469,13 +483,15 @@ DEPENDENCIES
   friendly_id (~> 5.1.0)
   i18n_data (~> 0.7.0)
   initialjs-rails (= 0.2.0.1)
+  invisible_captcha (~> 0.9.2)
   jazz_hands!
   jbuilder (~> 2.0)
   jquery-rails (~> 4.0.5)
   jquery-ui-rails (~> 5.0.5)
   jquery-validation-rails (~> 1.13.1)
   kaminari (~> 1.0.1)
   launchy (~> 2.4.3)
+  letter_opener_web (~> 1.3.1)
   newrelic_rpm (~> 3.13.2.302)
   paperclip (~> 4.3, >= 4.3.7)
   pg (~> 0.18.3)
@@ -485,6 +501,7 @@ DEPENDENCIES
   quiet_assets (~> 1.1.0)
   rails (= 4.2.10)
   rails-i18n (~> 4.0, >= 4.0.9)
+  rails4-autocomplete
   rails_layout (~> 1.0.26)
   rspec-rails (~> 3.7, >= 3.7.2)
   rubocop (~> 0.51.0)
@@ -508,8 +525,5 @@ DEPENDENCIES
   unicorn (~> 4.9.0)
   web-console (~> 2.0)
 
-RUBY VERSION
-   ruby 2.3.5p376
-
 BUNDLED WITH
    1.16.0

app/assets/javascripts/admin/admin.js

@@ -21,8 +21,14 @@
 //= require ../dependencies/foundation-datepicker
 //= require_tree ../dependencies/foundation-datepicker-locales
 //= require tinymce
+//= require autocomplete-rails
 //= require_tree .
 
 $(function() {
   $(document).foundation();
+
+  tinymce.init({
+    selector : "textarea:not(.mceNoEditor)",
+    language : 'es'
+  });
 });

app/assets/javascripts/admin/organizations.js

@@ -13,7 +13,7 @@ $(function(){
   });
   if ($('#nested-legal-representant-wrapper .legal-representant').length > 0) {
     $("#legal_representant_link").hide();
-  }  
+  }
 
 });
 

app/assets/javascripts/application.js

@@ -19,7 +19,13 @@
 //= require organizations
 //= require respond.min
 //= require rem.min
+//= require tinymce
 
 $(function() {
   $(document).foundation();
+
+  tinymce.init({
+    selector : "textarea:not(.mceNoEditor)",
+    language : 'es'
+  });
 });