Merge branch 'develop' into feature-131-create-restricted

Author: scottinet

.travis.yml

@@ -18,7 +18,7 @@ install:
 - npm install
 env:
   global:
-    secure: EZ+XXJFDtehmag7wt8JbutqgzpkkJUCzkEWw6W+p7MIxWenLyuGv/RUu7KGqAloOud1cZbmZGSfRx/vsPvxRjo+ZC7aaPqb74qRvfctGdlJTtEffS2jFno1pEppJzCR4n7vocSfMVYtOD6oHP67lXwn/Qnh++WUkZaV137m5+7rqiYgJ+JTeSs5jBRZ6X7VNoNz8tZXejQ+FOymCFQTS2JM/rSZX9NEK+OwUEhEjRcxqWMm2avk6NAQNAL3WQuIBJQH8lxEJxOXkMc0rQZZ09AoLpqJKzsaicaZMInt5JstPo2e9vJfhi+PpRSNhErIff36aCHWRYYDPKl5x6IelZpBfZeTdrs4V2TbRi1y0ELbgMG1FHS4HAw3vTnh4/49g01lAJed4UguFRc6MzwTLAL8uPG/zFe8snm9+kaf4pL7yO89Hf3eltE03+N//tyVv+X/jdSca2dBZ9FMeLE5pJ2jlRiKitCLjXmLUEMMxEwNF7K/IvOrD9wue3JXK0UogOpcXfppk++pNTijsZluU1Yj7k3fGFeS8d6rIU0Yj40y6/VMaJeL4EXlARRsGLigUKVjQL6+/N5xudlsCng+EG+WVIy4wEEPH0QgjUkPTgWx1NrUlTwjskE0cdqDOBu39WkRFJHHECYFPTfTuDJ7xxuuibFTQmUFu2zjbYfYKhPE=
+    secure: J5FHR91BBBrVqS5QMl+ZC3Oi2UgyQpW5SlKhfCwXJU2rz8XHNWajT5hjihlNiE6SVuUDVNflCcJI7DRD7+hwCt+G0rL9UuLnkKuMGVuVc/vMAjYpjRoVgWHk4KSwN4qWYcbF0k9d5POelI36xFnuQM0ttb3kDi/8T1s26Vsqw2Db1YDoK94ZkqO633gwwmr9RX05+sLXIuKai1bfIjUGU3YTusY0hDVw78Sg+/o1qCHNVwLDutpae/wLypO1/hujgh8SjIkAQBa/yp1gT2W+ykIaApk8eZn630usVttdToDgh2Z5+RLcgHOMi/p2/NvB/XKDq+sYh55tuKtdzu6MNx1vEVolcfiPkI0yPzwAs1IgTxAtGpKVkRlIZNMyksAQBikLqI6iFJHqYcPDHo+R+IwrXXSwZL/gbcfAtLiYWx1JnZHL8KfFz5KvRtINA4iEopzTQrOPJibFYNMWMyybvx7cHe4SAbtZxKq6cCt3fUzvwzfTIQ8m5k6y+w/bOiYY/HV8zvNw5bCS1N6h/6u8mmZMw3wv9N9eQz+h2BKwSziWt27CXcUKl6HhHklR7zj3/b7HwKW1o7Y0cixTl8kUBC8k+093Mhg4FmJWEAacfXVzRDs5nEejronmNUTi8hnpsSBeNMQnuD99zQp+eIi5PjfZ9DsCCM85cYb/LG1HyLs=
 deploy:
   provider: npm
   skip_cleanup: true

deploy.sh

@@ -5,12 +5,12 @@ then
   echo "Push generated dist folder"
   git config --global user.email "[email protected]"
   git config --global user.name "Travis CI"
-  git clone --quiet --branch=${TRAVIS_BRANCH} https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} travis-build
+  git clone --quiet --branch=${TRAVIS_BRANCH} https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} travis-build > /dev/null 2>&1
   cd travis-build
   ln -s  ${TRAVIS_BUILD_DIR}/node_modules
   npm run build
   git add dist/
-  git commit -am "Travis CI - [ci skip] - automatic dist folder"
+  git commit -am "Travis CI - [ci skip] - automatic dist folder" > /dev/null 2>&1
   git push origin ${TRAVIS_BRANCH}
 fi