Skip to content

Commit edbc266

Browse files
vastbinderjvastbinderj
committed
Merge branch 'develop' for release v1.1.22
2 parents ca67b6e + 122c729 commit edbc266

52 files changed

Lines changed: 1975 additions & 668 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/demo-staging.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useStrict" : "use strict",
3-
"apiUrl" : "http://api.demo.staging.ottemo.io",
4-
"mediaPath" : "http://demo.staging.ottemo.io/media/",
3+
"apiUrl" : "https://api.demo.staging.ottemo.io",
4+
"mediaPath" : "https://demo.staging.ottemo.io/media/",
55
"itemsPerPage" : "15"
66
}

‎config/dev.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useStrict" : "use strict",
3-
"apiUrl" : "http://api.dev.ottemo.io",
4-
"mediaPath" : "http://dev.ottemo.io/media/",
3+
"apiUrl" : "https://api.dev.ottemo.io",
4+
"mediaPath" : "https://dev.ottemo.io/media/",
55
"itemsPerPage" : "15"
66
}

‎config/kg-staging.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useStrict" : "use strict",
3-
"apiUrl" : "http://api.kg.staging.ottemo.io",
4-
"mediaPath" : "http://kg.staging.ottemo.io/media/",
3+
"apiUrl" : "https://api.kg.staging.ottemo.io",
4+
"mediaPath" : "https://kg.staging.ottemo.io/media/",
55
"itemsPerPage" : "15"
66
}

‎config/mp-staging.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"useStrict" : "use strict",
3-
"apiUrl" : "http://api.mp.staging.ottemo.io",
4-
"mediaPath" : "http://mp.staging.ottemo.io/media/",
3+
"apiUrl" : "https://api.mp.staging.ottemo.io",
4+
"mediaPath" : "https://mp.staging.ottemo.io/media/",
55
"itemsPerPage" : "15"
6-
}
6+
}

‎config/rk-staging.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"useStrict" : "use strict",
3-
"apiUrl" : "http://api.rk.staging.ottemo.io",
4-
"mediaPath" : "http://rk.staging.ottemo.io/media/",
3+
"apiUrl" : "https://api.rk.staging.ottemo.io",
4+
"mediaPath" : "https://rk.staging.ottemo.io/media/",
55
"itemsPerPage" : "15"
66
}
77

‎config/sb-prod.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"useStrict" : "use strict",
3+
"apiUrl" : "https://api.mystembox.com",
4+
"mediaPath" : "https://mystembox.com/media/",
5+
"itemsPerPage" : "15"
6+
}

‎config/sb-staging.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"useStrict" : "use strict",
3+
"apiUrl" : "https://api.sb.staging.ottemo.io",
4+
"mediaPath" : "https://sb.staging.ottemo.io/media/",
5+
"itemsPerPage" : "15"
6+
}

‎config/scs-prod.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"useStrict" : "use strict",
3+
"apiUrl" : "https://api.southcoastswords.com",
4+
"mediaPath" : "https://southcoastswords.com/media/",
5+
"itemsPerPage" : "15"
6+
}

‎config/scs-staging.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"useStrict" : "use strict",
3+
"apiUrl" : "https://api.scs.staging.ottemo.io",
4+
"mediaPath" : "https://scs.staging.ottemo.io/media/",
5+
"itemsPerPage" : "15"
6+
}

‎deploy.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ if [ "$BRANCH" == 'develop' ]; then
2323
elif [ "$REMOTE_HOST" == 'demo.staging.ottemo.io' ]; then
2424
HOST=demo-staging
2525
elif [ "$REMOTE_HOST" == 'mp.staging.ottemo.io' ]; then
26-
HOST=mp-staging
26+
HOST=mp-staging
27+
elif [ "$REMOTE_HOST" == 'sb.staging.ottemo.io' ]; then
28+
HOST=sb-staging
29+
elif [ "$REMOTE_HOST" == 'scs.staging.ottemo.io' ]; then
30+
HOST=scs-staging
2731
fi
2832
# gulp build on remote host
2933
ssh ottemo@$REMOTE_HOST "cd $SRCDIR && npm install && gulp build --env=staging --config=${HOST}"

0 commit comments

Comments
 (0)