Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.19.0 #1851

Merged
merged 44 commits into from
Feb 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
6abf924
Admin View Revamp (#1698)
mikemurray Jan 17, 2017
9b104e2
Revert "Admin View Revamp"
mikemurray Jan 17, 2017
25b4052
Merge pull request #1722 from reactioncommerce/revert-1698-1628-move-…
Jan 17, 2017
bc0ab4e
fix CircleCI unset var issue with production deployment
jshimko Jan 17, 2017
a32125e
Merge pull request #1724 from reactioncommerce/circle-deployment-fixes
Jan 18, 2017
57f20cd
Update package.json
Jan 18, 2017
e4a0fbb
Fix Product Not Found infinite spinner (#1725)
kieckhafer Jan 19, 2017
75c2f9b
update product publication to publish all types (#1738)
kieckhafer Jan 20, 2017
b97913d
Moved style import to index.less (#1729)
mikemurray Jan 20, 2017
5cd5b40
make CI script executable
jshimko Jan 26, 2017
f3bea53
Update notificationDropdown.js
Jan 31, 2017
7dcf94d
Merge branch 'development' into 1708-notifications-i18n-typo
Jan 31, 2017
071f600
Merge pull request #1765 from f3rnando/1708-notifications-i18n-typo
Feb 1, 2017
77cbf3a
Simplify PR template (#1825)
brent-hoover Feb 15, 2017
bd61902
Release 19 (#1657)
kieckhafer Feb 16, 2017
af5b536
i18n additions in cart, Toast alert z-index fix (#1852)
kieckhafer Feb 16, 2017
1508ce7
1762 + Meteor 1.4.2.7 (#1855)
Feb 20, 2017
b257e19
update Docker base to reactioncommerce/base:v1.2.0
jshimko Feb 20, 2017
643642d
Merge pull request #1869 from reactioncommerce/update-docker-base
Feb 21, 2017
77e6af6
add missing translations (#1866)
kieckhafer Feb 21, 2017
9a126a0
1586 cart product link doesnt work - fix (#1861)
prosf Feb 21, 2017
4c18abb
Updated Shippo and rate handling in order fulfillment (#1847)
Feb 21, 2017
be06dc2
Disable consistent-return
Feb 22, 2017
f5623ab
Lint updates
Feb 22, 2017
9b22fed
Resolve Lint dependency
Feb 22, 2017
105d4fb
Merge branch 'development' into lint-updates
Feb 22, 2017
b089454
Fix lint issues and cleanup (#1880)
mikemurray Feb 22, 2017
0b28ad7
Restore deleted migrations (#1879)
mikemurray Feb 22, 2017
073746a
Merge branch 'development' into lint-updates
Feb 22, 2017
7798d7d
LingoHub Update :rocket: (#1856)
Feb 22, 2017
c5b052d
Merge branch 'development' into lint-updates
Feb 22, 2017
c5f7a95
Merge pull request #1878 from reactioncommerce/lint-updates
Feb 22, 2017
04d2c63
Ignore packages
Feb 22, 2017
e772193
Migrations for package registry (#1883)
Feb 23, 2017
b326c23
error, warning, and linting fixes for bithound (#1885)
kieckhafer Feb 23, 2017
42c48b0
Restore quotes.
Feb 23, 2017
4076768
Fix template name definition
mikemurray Feb 23, 2017
39bbbcc
Fix accounts dropdown admin shortcuts
mikemurray Feb 23, 2017
1c78c0a
Merge branch 'development' into mm-19-fixes
mikemurray Feb 23, 2017
7367254
Merge pull request #1888 from reactioncommerce/mm-19-fixes
Feb 23, 2017
641c4d1
update search results to use their own notice / badges template (#1889)
kieckhafer Feb 23, 2017
c42a73f
Check result
Feb 23, 2017
aa78539
Skip location tests
brent-hoover Feb 23, 2017
bfaf0c0
Get orderId back from copyCartToOrder
brent-hoover Feb 23, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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