Merge branch 'master' into 'v1.2'

use updated oauth3

See merge request !4
This commit is contained in:
AJ ONeal 2017-11-08 12:59:36 -07:00
commit 20eccd5f31
2 changed files with 3 additions and 2 deletions

View File

@ -53,7 +53,7 @@ Installation
We're still in a stage where the installation generally requires many manual steps.
``bash
```bash
curl https://git.daplie.com/Daplie/walnut.js/raw/v1.2/installer/get.sh | bash
```

View File

@ -9,6 +9,8 @@ my_name=walnut
my_app_pkg_name=com.daplie.walnut.web
my_app_ver="v1.2"
my_azp_oauth3_ver="v1.2"
# is the old version still needed in launchpad?
#my_azp_oauth3_ver="v1.1.3"
export NODE_VERSION="v8.9.0"
if [ -z "${my_tmp-}" ]; then
@ -26,7 +28,6 @@ fi
#my_app_ver="v1.1"
my_app_ver="installer-v2"
my_launchpad_ver="v1.2"
my_azp_oauth3_ver="v1.1.3"
my_iss_oauth3_rest_ver="v1.2.0"
my_iss_oauth3_pages_ver="v1.2.1"
my_www_daplie_ver=v1.0.15