merge to 7.3.0

.node-version

@@ -0,0 +1 @@
+7.8.0

.ruby-version

@@ -1 +1 @@
-ruby-2.3.4
+2.3.4

CHANGELOG.md

@@ -20,7 +20,29 @@ This file follows the best practices from [keepachangelog.com](http://keepachang
 
 ### Security
 
-## [7.1.0] - 2017-11-22
+## [7.3.0] - 2018-02-23
+
+### Added
+
+- Per hour availability [3166](https://github.com/sharetribe/sharetribe/pull/3166)
+- Support for NZ bank account with Stripe [3165](https://github.com/sharetribe/sharetribe/pull/3165)
+- "View conversations" section in admin panel [3173](https://github.com/sharetribe/sharetribe/pull/3173)
+- Account tokens for Stripe bank account connections [3234](https://github.com/sharetribe/sharetribe/pull/3234)
+
+### Changed
+
+- Made user confirmation form more secure [3170](https://github.com/sharetribe/sharetribe/pull/3170)
+
+### Removed
+
+- Confirmation days x after end time of the transaction [3205](https://github.com/sharetribe/sharetribe/pull/3205)
+
+### Fixed
+
+- Improvements to PayPal workflow (IPNs) [3176](https://github.com/sharetribe/sharetribe/pull/3176)
+- Some bugs related to sending emails from admin[#3183](https://github.com/sharetribe/sharetribe/pull/3183)
+
+## [7.2.0] - 2017-11-22
 
 ### Added
 

Gemfile

@@ -168,7 +168,7 @@ group :test do
   # required for CircleCI automatic test balancing
   gem 'rspec_junit_formatter'
 
-  gem 'fake_stripe'
+  gem 'fake_stripe', git: 'https://github.com/ithouse/fake_stripe.git', ref: '6848daab104333b2c0c493ab069731d4a0b87f6f'
 end
 
 group :development, :test do
@@ -192,3 +192,4 @@ gem 'intercom'
 
 gem 'twitter_cldr'
 gem 'memoist'
+gem 'biz'

Gemfile.lock

@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/ithouse/fake_stripe.git
+  revision: 6848daab104333b2c0c493ab069731d4a0b87f6f
+  ref: 6848daab104333b2c0c493ab069731d4a0b87f6f
+  specs:
+    fake_stripe (0.1.0)
+      capybara
+      sinatra
+      webmock
+
 GIT
   remote: https://github.com/ithouse/mercury.git
   revision: 1a9d4ac5a0a5fd0d459ff1986f9f05e617415b16
@@ -82,6 +92,9 @@ GEM
     bindex (0.5.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    biz (1.7.0)
+      clavius (~> 1.0)
+      tzinfo
     builder (3.2.3)
     byebug (9.0.6)
     callsite (0.0.11)
@@ -122,6 +135,7 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
     chunky_png (1.3.8)
+    clavius (1.0.3)
     cldr-plurals-runtime-rb (1.0.1)
     climate_control (0.2.0)
     cocaine (0.5.8)
@@ -209,10 +223,6 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    fake_stripe (0.0.12)
-      capybara
-      sinatra
-      webmock
     faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.4)
@@ -247,7 +257,7 @@ GEM
     haml (5.0.1)
       temple (>= 0.8.0)
       tilt
-    hashdiff (0.3.4)
+    hashdiff (0.3.7)
     hashie (3.5.5)
     hiredis (0.6.1)
     htmlentities (4.3.4)
@@ -302,7 +312,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.3.0)
     minitest (5.10.2)
     monetize (1.6.0)
       money (~> 6.8)
@@ -319,7 +329,7 @@ GEM
     multi_test (0.1.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustermann (1.0.0)
+    mustermann (1.0.1)
     mysql2 (0.4.6)
     nenv (0.3.0)
     net-scp (1.2.1)
@@ -328,8 +338,8 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (4.2.0.334)
     nio4r (2.1.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -584,7 +594,7 @@ GEM
       multi_json
       multipart-post (~> 2.0)
       trollop (~> 2.0)
-    webmock (3.0.1)
+    webmock (3.3.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -612,6 +622,7 @@ DEPENDENCIES
   aws-sdk (~> 2.9.25)
   better_errors (~> 2.1.1)
   binding_of_caller
+  biz
   capistrano (~> 3.9.1)
   capistrano-bundler (~> 1.2.0)
   capistrano-npm (~> 1.0.2)
@@ -636,7 +647,7 @@ DEPENDENCIES
   dynamic_form (~> 1.1.4)
   email_spec (~> 2.1.1)
   factory_girl_rails (~> 4.8.0)
-  fake_stripe
+  fake_stripe!
   faraday (~> 0.11.0)
   faraday-encoding (~> 0.0.4)
   faraday_middleware (~> 0.11.0)

README.md

@@ -49,10 +49,10 @@ Would you like to set up your marketplace in one minute without touching code? [
 ### Requirements
 
 Before you get started, the following needs to be installed:
-  * **Ruby**. Version 2.3.4 is currently used and we don't guarantee everything works with other versions. If you need multiple versions of Ruby, [RVM](https://rvm.io//) is recommended.
+  * **Ruby**. Version 2.3.4 is currently used and we don't guarantee everything works with other versions. If you need multiple versions of Ruby, [RVM](https://rvm.io//) or [rbenv](https://github.com/rbenv/rbenv) is recommended.
   * [**RubyGems**](http://rubygems.org/)
   * **Bundler**: `gem install bundler`
-  * **Node**. Version 7.8 is currently used and we don't guarantee everything works with other versions. If you need multiple versions of Node, consider using [n](https://github.com/tj/n) or [nvm](https://github.com/creationix/nvm).
+  * **Node**. Version 7.8 is currently used and we don't guarantee everything works with other versions. If you need multiple versions of Node, consider using [n](https://github.com/tj/n), [nvm](https://github.com/creationix/nvm), or [nenv](https://github.com/ryuone/nenv).
   * [**Git**](http://help.github.com/git-installation-redirect)
   * **A database**. Only MySQL 5.7 has been tested, so we give no guarantees that other databases (e.g. PostgreSQL) work. You can install MySQL Community Server two ways:
     1. If you are on a Mac, use homebrew: `brew install mysql` (*highly* recommended). Also consider installing the [MySQL Preference Pane](https://dev.mysql.com/doc/refman/5.1/en/osx-installation-prefpane.html) to control MySQL startup and shutdown. It is packaged with the MySQL downloadable installer, but can be easily installed as a stand-alone.
@@ -394,11 +394,17 @@ Stripe can be used in the open-source alternative, as long as your country and c
 
 ### Enable Stripe
 
-Starting from release 7.2.0, Stripe is enabled. 
+Starting from release 7.2.0, Stripe is supported.
 
-Stripe API keys are encrypted and you should the `app_encryption_key` variable from the `config/config.yml` file.
-Stripe can be configured from the admin panel, in the "Payment settings" section.
+Stripe API keys will be encrypted when stored so it is important to configure your own random encryption key.
+You should fill the `app_encryption_key` variable in the `config/config.yml` file with a long random string, unique to your project.
 
+Stripe can be configured from the admin panel, in the "Payment settings" section. Instructions on how to get Stripe API keys can be found there.
+
+If Stripe isn't automatically enabled in the admin panel after upgrading to 7.2.0, you should run the following commands in your Rails console, where `<ID>` is your marketplace ID (probably `1`):
+`TransactionService::API::Api.processes.create(community_id: <ID>, process: :preauthorize, author_is_seller: true)`
+and
+`TransactionService::API::Api.settings.provision(community_id: <ID>, payment_gateway: :stripe, payment_process: :preauthorize, active: true)`.
 
 ## Versioning
 

UPGRADE.md

@@ -33,6 +33,10 @@ See instructions how to set application in [maintenance mode in Heroku](https://
 
 ## Unreleased
 
+## Upgrade from 7.2.0 to 7.3.0
+
+Nothing special. See the [#general-update-instructions].
+
 ## Upgrade from 7.1.0 to 7.2.0
 
 Nothing special. See the [#general-update-instructions].

VERSION

@@ -1 +1 @@
-7.2.0
+7.3.0

app/assets/javascripts/analytics.js

@@ -105,7 +105,7 @@ window.ST.analytics = (function(){
     });
 
     $(document).on('st-analytics:setup', function(event, info) {
-      _gtm_identify(dataLayer, info.community_id, info.feature_flags);
+      _gtm_identify(dataLayer, info);
     });
   };
 

app/assets/javascripts/application.js

@@ -37,6 +37,7 @@
 //= require jquery.fileupload-validate
 //= require jquery.fileupload-image
 //= require autosize
+//= require regenerator-runtime/runtime
 
 //= require jquery.fancybox.js