Skip to content

Commit

Permalink
Merge pull request #1851 from reactioncommerce/development
Browse files Browse the repository at this point in the history
Release 0.19.0
  • Loading branch information
mikemurray authored Feb 23, 2017
2 parents 7dfaa8d + bfaf0c0 commit bd93bb1
Show file tree
Hide file tree
Showing 990 changed files with 26,672 additions and 6,268 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
*.min.*
server/plugins.js
client/plugins.js
packages/*
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
/**
* Best practices
*/
"consistent-return": [1, { // http://eslint.org/docs/rules/consistent-return
"treatUndefinedAsUnspecified": false
"consistent-return": [0, { // http://eslint.org/docs/rules/consistent-return
"treatUndefinedAsUnspecified": true
}],
"curly": [2, "multi-line"], // http://eslint.org/docs/rules/curly
"default-case": 2, // http://eslint.org/docs/rules/default-case
Expand Down
6 changes: 5 additions & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
For bugs, please fill out the three following sections completely
For bugs, please fill out the three following sections completely. Failure to provide
this information may result in your ticket being closed without comments.

Are you looking for support for installation/getting started with Reaction? Please go
to our [Gitter](https://gitter.im/reactioncommerce/reaction) channel instead.

### Expected behavior

Expand Down
13 changes: 5 additions & 8 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<!-- Thanks so much for your PR, your contribution is appreciated! -->
**Are you submitting to `development`?**

We currently only accept PR's to `development` not `master`
Please provide the following information to help us approve your PR. Failure to provide this
information may result in your PR being closed without comment.

- [ ] Clearly explain what your PR is trying to accomplish. A link to an issue is best
- [ ] Provide us detailed instructions on how we can test your PR

- [ ] Description explains the issue / use-case resolved
- [ ] Only contains code directly related to the issue
- [ ] Has tests.
- [ ] Has docs.
- [ ] Passes all tests
- [ ] Has been linted and follows the style guide
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ results
allure-results

client/plugins.js
client/plugins.css
client/plugins.less
client/plugins.styl
client/plugins.scss
server/plugins.js

custom/client/*
Expand Down
5 changes: 3 additions & 2 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ [email protected] # Enable ECMAScript2015+ syntax in app code
[email protected] # ensure meteor method argument validation
[email protected] # security-related policies enforced by newer browsers
juliancwirko:postcss # CSS post-processing plugin (replaces standard-minifier-css)
standard-minifier-js@1.2.1 # a minifier plugin used for Meteor apps by default
abernix:standard-minifier-js # a minifier plugin used for Meteor apps by default
[email protected] # ReactiveDict whose contents are preserved across Hot Code Push
[email protected] # Meteor transparent reactive programming library
[email protected]
Expand Down Expand Up @@ -58,6 +58,7 @@ cfs:gridfs
cfs:standard-packages
cfs:storage-adapter
cfs:ui
dispatch:run-as-user
jeremy:stripe
jparker:gravatar
juliancwirko:s-alert
Expand All @@ -75,7 +76,7 @@ tmeasday:publish-counts
vsivsi:job-collection
react-meteor-data
percolate:migrations

gadicc:blaze-react-component

# Testing packages
dburles:factory
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[email protected].3
[email protected].7
94 changes: 49 additions & 45 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
abernix:[email protected]
abernix:[email protected]
[email protected]
accounts-facebook@1.0.11
accounts-google@1.0.11
accounts-facebook@1.1.0
accounts-google@1.1.0
[email protected]
[email protected].3
accounts-twitter@1.1.12
[email protected].4
accounts-twitter@1.2.0
alanning:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
Expand All @@ -16,20 +19,20 @@ [email protected]
[email protected]
[email protected]
[email protected]
babel-compiler@6.13.0
babel-compiler@6.14.1
[email protected]
[email protected]
[email protected]
blaze@2.2.1
blaze-html-templates@1.0.5
blaze@2.3.0
blaze-html-templates@1.1.0
[email protected]
[email protected]
browser-policy@1.0.9
browser-policy@1.1.0
[email protected]
browser-policy-content@1.0.12
browser-policy-framing@1.0.12
browser-policy-content@1.1.0
browser-policy-framing@1.1.0
[email protected]
caching-html-compiler@1.0.7
caching-html-compiler@1.1.0
[email protected]
cfs:[email protected]
cfs:[email protected]
Expand All @@ -51,34 +54,36 @@ cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
[email protected].4
[email protected].5
chuangbo:[email protected]
[email protected]_4
dburles:[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
[email protected].12
[email protected].13
[email protected]
[email protected]
dispatch:[email protected]
[email protected]
dispatch:[email protected]
dispatch:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
facebook@1.2.10
facebook-oauth@1.3.0
[email protected]
gadicc:[email protected]
[email protected]
google@1.1.15
google-oauth@1.2.0
[email protected]
[email protected]
[email protected]
[email protected].10
[email protected].11
[email protected]
jeremy:[email protected]
johanbrook:[email protected].5
johanbrook:[email protected].6
jparker:[email protected]
jparker:[email protected]
jparker:[email protected]
Expand All @@ -89,41 +94,41 @@ juliancwirko:[email protected]
kadira:[email protected]
kadira:[email protected]
kadira:[email protected]
[email protected].0
[email protected].8
[email protected].1
[email protected].9
[email protected]
[email protected]
[email protected].16
[email protected].17
matb33:[email protected]
mdg:[email protected]
mdg:[email protected]
[email protected].0
[email protected].1
[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
[email protected].15
[email protected].15
[email protected].19
[email protected].16
[email protected].17
[email protected].20
[email protected]
[email protected].13
[email protected].7
[email protected].7
[email protected].14
[email protected].9
[email protected].9
momentjs:[email protected]
[email protected].14
[email protected].15
[email protected]
[email protected]
mrt:[email protected]
[email protected]
[email protected].11_2
[email protected].12
[email protected].16_1
[email protected].13
[email protected]
[email protected]
[email protected]
[email protected].14
[email protected].15
ongoworks:[email protected]
[email protected]
percolate:[email protected]
Expand All @@ -145,22 +150,21 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
spacebars-compiler@1.0.13
spacebars-compiler@1.1.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
tmeasday:[email protected]
tmeasday:[email protected]
[email protected].1
twitter@1.1.14
[email protected].2
twitter-oauth@1.2.0
[email protected]
[email protected]
url@1.0.11
url@1.1.0
vsivsi:[email protected]
[email protected].12
[email protected].13
[email protected]
2 changes: 1 addition & 1 deletion .reaction/ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}

# if we're not on a deployment branch, skip the Docker build/test
if [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != "development" ]]; then
if [[ -z "$CIRCLE_TAG" && "$CIRCLE_BRANCH" != "development" ]]; then
echo "Not running a deployment branch. Skipping the Docker build test."
exit 0
fi
Expand Down
30 changes: 30 additions & 0 deletions .reaction/ci/deploy-development.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash

set -e

## Required environment variables in your CircleCI dashboard
# (used to push to Docker Hub)
#
# $DOCKER_USER - Docker Hub username
# $DOCKER_PASS - Docker Hub password
# $DOCKER_EMAIL - Docker Hub email


## Optional Environment Variables
# (used to customize the destination on Docker Hub without having to edit the circle.yml)
#
# $DOCKER_NAMESPACE - the image name for production deployments [Default]: reactioncommerce/reaction
# $DOCKER_NAMESPACE_DEV - the name image for development deployments [Default]: reactioncommerce/prequel


# Development branch deployment
DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}
DOCKER_NAMESPACE_DEV=${DOCKER_NAMESPACE_DEV:-"reactioncommerce/prequel"}

docker tag $DOCKER_NAMESPACE:latest $DOCKER_NAMESPACE_DEV:latest
docker tag $DOCKER_NAMESPACE_DEV:latest $DOCKER_NAMESPACE_DEV:$CIRCLE_BUILD_NUM

docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS

docker push $DOCKER_NAMESPACE_DEV:$CIRCLE_BUILD_NUM
docker push $DOCKER_NAMESPACE_DEV:latest
29 changes: 29 additions & 0 deletions .reaction/ci/deploy-production.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/bash

set -e

## Required environment variables in your CircleCI dashboard
# (used to push to Docker Hub)
#
# $DOCKER_USER - Docker Hub username
# $DOCKER_PASS - Docker Hub password
# $DOCKER_EMAIL - Docker Hub email


## Optional Environment Variables
# (used to customize the destination on Docker Hub without having to edit the circle.yml)
#
# $DOCKER_NAMESPACE - the image name for production deployments [Default]: reactioncommerce/reaction
# $DOCKER_NAMESPACE_DEV - the name image for development deployments [Default]: reactioncommerce/prequel


# Master branch deployment (only runs when a version git tag exists - syntax: "v1.2.3")
# The git tag is available in $CIRCLE_TAG
DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}

docker tag $DOCKER_NAMESPACE:latest $DOCKER_NAMESPACE:$CIRCLE_TAG

docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS

docker push $DOCKER_NAMESPACE:$CIRCLE_TAG
docker push $DOCKER_NAMESPACE:latest
46 changes: 0 additions & 46 deletions .reaction/ci/deploy.sh

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM reactioncommerce/base:v1.0.3
FROM reactioncommerce/base:v1.2.0

# Default environment variables
ENV ROOT_URL "http://localhost"
Expand Down
Loading

0 comments on commit bd93bb1

Please sign in to comment.