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 1.3.0 #2417

Merged
merged 284 commits into from
Jun 22, 2017
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
284 commits
Select commit Hold shift + click to select a range
6efe0c8
Clean up a few edge cases
joykare Mar 28, 2017
0d41925
Merge branch 'development' into kieha-orders-pagination-1921
brent-hoover Mar 28, 2017
b9c12c3
Merge branch 'kieha-orders-pagination-1921' of https://github.com/rea…
Mar 28, 2017
60e6891
Add i18n translations
joykare Mar 28, 2017
6d6e665
Merge branch 'joykare-inventory-tracking-1928' of github.com:reaction…
joykare Mar 28, 2017
9f109e6
Remove file changes different from development
joykare Mar 28, 2017
6990879
Turns out I don't need this publication; it doesn't work well anyway …
Mar 28, 2017
713da1c
Merge branch 'master' into development
Mar 28, 2017
85ed068
Merge branch 'development' into joykare-inventory-tracking-1928
Mar 29, 2017
d15edf5
Remove all references to addressbook.js
joykare Mar 29, 2017
bc16da9
Set custom layout to override based on priority field (#2023)
impactmass Mar 29, 2017
c0c665d
Method to aggregate order counts
Mar 29, 2017
9839568
Merge branch 'development' into kieha-orders-pagination-1921
Mar 29, 2017
b8f4fa7
Merge branch 'kieha-orders-pagination-1921' of https://github.com/rea…
Mar 29, 2017
634975e
Merge branch 'development' into joykare-inventory-tracking-1928
Mar 29, 2017
fad6051
Merge pull request #2034 from reactioncommerce/joykare-inventory-trac…
Mar 29, 2017
c301ed3
fix createDefaultAdminUser behavior with users in the system
callmephilip Mar 29, 2017
6160ea2
Resolve cart addition issue (#2048)
joykare Mar 30, 2017
115e88f
Merge branch 'development' into kieha-orders-pagination-1921
Mar 30, 2017
046035c
Calling aggregate function in React container
Mar 30, 2017
b2497cf
Merge branch 'kieha-orders-pagination-1921' of https://github.com/rea…
Mar 30, 2017
336c094
Rewriting aggregate method to use wrapAsync
Mar 30, 2017
51bf059
Returning Toplevel products as per scroll limit for non admin users f…
hrath2015 Mar 30, 2017
fa5d47e
Refactor calling aggregate function in React container
Mar 30, 2017
e34fc1a
Removing unnecessary order subscriptions in order template
Mar 30, 2017
e6a0b70
Removing unnecessary order Counts.publish from Orders publication
Mar 30, 2017
f953573
Merge branch 'development' into kieha-orders-pagination-1921
Mar 30, 2017
bc01921
[WIP] Broken Formatting for Non-USD currencies (#2062)
abdulsemiu-atanda Mar 31, 2017
6b495f0
Merge branch 'development' into kieha-orders-pagination-1921
Mar 31, 2017
aa47224
Set order count to 0 if there are no orders in the database
Mar 31, 2017
f786b66
Remove unnecessary parameter to order/count
Mar 31, 2017
e319385
Changes to order template:
Mar 31, 2017
c64dfd1
Using publish-counts to display order counts
Apr 3, 2017
bb64188
Removing unnecessary orders/count method
Apr 3, 2017
b04b92c
Adding i18n on Show More button
Apr 3, 2017
7fa095c
Adding optional check on filter in PaginatedOrders publication
Apr 3, 2017
41dd705
Merge branch 'development' into patch-1
brent-hoover Apr 4, 2017
b3a2501
Sending subscription limit as props to React component
Apr 4, 2017
a7c1e87
Don't subscribe to all media (#2073)
mikemurray Apr 4, 2017
1f1ef9c
Merge branch 'development' into kieha-orders-pagination-1921
Apr 5, 2017
6d7cfc6
Fix endless spinner issue
Apr 5, 2017
af12de4
Add requirements to readme
Apr 5, 2017
50487ac
Merge branch 'development' into spencer-docs-requirements
Apr 5, 2017
5d478a6
Move requirements below installation
Apr 5, 2017
8706d6e
Merge pull request #2085 from reactioncommerce/spencer-docs-requirements
Apr 5, 2017
de624d4
Remove isHidden check from core startup b/c blocking safari - fixes #…
spencern Apr 5, 2017
a0ec38c
Request versions (reaction -v) output in issue template (#2087)
spencern Apr 6, 2017
875c670
Merge branch 'development' into kieha-orders-pagination-1921
Apr 6, 2017
e53dd4d
Merge branch 'development' into patch-1
brent-hoover Apr 6, 2017
4691799
Fetch all Shippo carriers (#2078)
impactmass Apr 7, 2017
244a600
Fix transliteration package to 1.5.2 which doesn’t leak ES6 into bundle
spencern Apr 7, 2017
cf04dfe
Merge branch 'development' into kieha-orders-pagination-1921
Apr 7, 2017
8b2e4fa
Merge branch 'development' into spencer-fix-2088-blank-safari
Apr 7, 2017
d5e9838
Merge pull request #2089 from reactioncommerce/spencer-fix-2088-blank…
Apr 7, 2017
6cdfb48
Merge branch 'development' into kieha-orders-pagination-1921
Apr 7, 2017
cc0b1b9
Merge pull request #2036 from reactioncommerce/kieha-orders-paginatio…
Apr 7, 2017
fae0078
Fix issue #2026 changed price not displayed for prod on grid page (#2…
hrath2015 Apr 7, 2017
a912715
Convert text field to select field for countries (#2082)
brent-hoover Apr 7, 2017
cf3b957
Merge branch 'development' into spencer-fix-prerender
Apr 7, 2017
24aa8bf
[WIP] #2070 Fix PDP Url Path For Grid Settings (#2094)
Apr 9, 2017
7a76354
Merge branch 'development' into patch-1
brent-hoover Apr 9, 2017
b8620b1
Remove legacy PDP (#2097)
impactmass Apr 11, 2017
6ee9cdd
Merge branch 'development' into patch-1
Apr 11, 2017
3d75819
Set total quantity as actual sum of quantity
brent-hoover Apr 12, 2017
228fc33
Don't break out order items
brent-hoover Apr 12, 2017
6864416
set cartItemId to just _id since they are the same now
brent-hoover Apr 12, 2017
d8f8f38
Fix unrelated error with missing import
brent-hoover Apr 12, 2017
9afb9a8
Create shipping record
brent-hoover Apr 12, 2017
f6b0bca
Don't use cartItemId
brent-hoover Apr 12, 2017
7945691
Group lineItems by _id rather than cartItemId
brent-hoover Apr 12, 2017
d513d4f
Use _id rather than cartItemId. Use sum of quantities rather than length
brent-hoover Apr 12, 2017
657f532
Restore check for empty items array to fix test
brent-hoover Apr 12, 2017
bb9aad8
Change cartItemId to _id
joykare Apr 12, 2017
ad737c0
2067 Improper Product Title Wrap (#2108)
abdulsemiu-atanda Apr 12, 2017
a1690d0
Fix Avalara document id (#2114)
brent-hoover Apr 12, 2017
25eb7b7
Use order.items to display line items
joykare Apr 12, 2017
4a57629
Merge branch 'development' into spencer-fix-prerender
Apr 12, 2017
bc3e6a0
Merge pull request #2091 from reactioncommerce/spencer-fix-prerender
Apr 12, 2017
f5bee13
Update core.js
Apr 12, 2017
da25d62
Merge branch 'development' into patch-1
Apr 12, 2017
5ebd3e6
Merge pull request #2060 from callmephilip/patch-1
Apr 12, 2017
234df11
Merge branch 'development' into brent-fix-explode-orders-2102
brent-hoover Apr 13, 2017
db064ab
If cartItemId exists from legacy orders, then use those
brent-hoover Apr 13, 2017
5cf275d
Don't create default admin user when running in app test mode
brent-hoover Apr 14, 2017
ba88b25
Fix "Set Custom Value" on Avalara Usage Type (#2107)
impactmass Apr 14, 2017
1e5ffa8
Merge branch 'development' into brent-fix-test-runner
brent-hoover Apr 14, 2017
cbf602f
Merge pull request #2124 from reactioncommerce/brent-fix-test-runner
Apr 14, 2017
3fc1948
Merge branch 'development' into brent-fix-explode-orders-2102
Apr 14, 2017
ea62de2
Merge pull request #2119 from reactioncommerce/brent-fix-explode-orde…
Apr 14, 2017
ed979ef
Fixes #2116 failure to send email (#2118)
spencern Apr 14, 2017
b9a5237
Allow customer to move past validation after one pass
brent-hoover Apr 17, 2017
6917f5c
Silencing needless warning
brent-hoover Apr 17, 2017
cca678a
Add missing imports
brent-hoover Apr 17, 2017
433bef6
When we get a "GetTax" error, revert to addressbook
brent-hoover Apr 17, 2017
5b64575
Capture and parse errors
brent-hoover Apr 17, 2017
9101c01
Fix missing import
brent-hoover Apr 18, 2017
c7c51f6
Add import, adjust Proptypes
brent-hoover Apr 18, 2017
7e31fb5
Update read only Quantity in top variant #1919 (#2065)
joykare Apr 18, 2017
808366e
Merge branch 'development' into brent-fix-issue-2112
kieckhafer Apr 18, 2017
ad16176
Merge pull request #2132 from reactioncommerce/brent-fix-issue-2112
kieckhafer Apr 18, 2017
8a15bd3
1994 Console Dropzone Warnings (#2138)
abdulsemiu-atanda Apr 19, 2017
a31b8ac
Merge release 1.1.1 (master) into development
Apr 19, 2017
86e6ddb
Update Summary Card for Order (#2105)
joykare Apr 20, 2017
564dfdf
Creating a "review and fix" address review screen
brent-hoover Apr 20, 2017
8afa559
Add to Cart Alert Behavior (#2076)
abdulsemiu-atanda Apr 20, 2017
7f7a02a
Show highlited diff. Copy over values on click.
brent-hoover Apr 21, 2017
9a56646
Removing "debug" HTML
brent-hoover Apr 21, 2017
28db441
Add "review address" translation
brent-hoover Apr 21, 2017
f5c7c9e
Basic "review address" flow working
brent-hoover Apr 21, 2017
c5c79a4
Remove console.log
brent-hoover Apr 21, 2017
cbb52b6
[WIP] 2137 Specify Shippo Version (#2146)
abdulsemiu-atanda Apr 21, 2017
a74c5b5
fix currency formatting in invoice (#2147)
abdulsemiu-atanda Apr 22, 2017
501c43e
language dropdown updates (#2148)
kieckhafer Apr 24, 2017
540c24e
Merge branch 'development' into brent-fix-issue-2104
brent-hoover Apr 25, 2017
9393e16
Fix missing import
brent-hoover Apr 25, 2017
9218f31
Fix import error
brent-hoover Apr 25, 2017
4ac11b2
Return to edit and refresh address when you cancel out of review
brent-hoover Apr 25, 2017
9f8da99
Make edit behave the same as add
brent-hoover Apr 25, 2017
3d972d0
Tweak styling
brent-hoover Apr 25, 2017
67c2eb5
fix dark-gray background on notification hover state (#2163)
abdulsemiu-atanda Apr 25, 2017
b0685c0
Cancel Order (#2022)
Apr 26, 2017
e7d2313
Adds Reaction method for adding roles to a default role set.
spencern Apr 26, 2017
815d58a
Tests for adding default roles
spencern Apr 27, 2017
fb07802
One more test
spencern Apr 27, 2017
5dcb2ff
Merge branch 'development' into spencer-method-for-adding-default-roles
spencern Apr 27, 2017
df4afe0
Run all tests instead of just `addDefaultRoles` tests
spencern Apr 28, 2017
c4d2f3f
Fix for Account Meteor Method tests that relied on Shops not being reset
spencern Apr 28, 2017
b5fc5c2
Merge pull request #2174 from reactioncommerce/spencer-method-for-add…
kieckhafer May 1, 2017
47f0561
[WIP] 2115 Inconsistent Product Image of Cart Item (#2171)
abdulsemiu-atanda May 2, 2017
38dde68
Order methods test (#2159)
May 2, 2017
2edc852
PDP Cleanup - Basic Details Card, Tax Card & Inventory Card (#2086)
May 3, 2017
16e7a10
update the way address data is provided (#2208)
kieckhafer May 4, 2017
a44c23d
METEOR 1.4.4.2 (#2206)
May 4, 2017
cdb2ac3
Added Kuwait, Saudi Arabia and Qatar currencies (#2204)
lcampanis May 5, 2017
0e9ed5b
fix email log panel closing when email is sent (#2205)
abdulsemiu-atanda May 8, 2017
945ffd9
add order id to completed screen (#2202)
May 8, 2017
659dd7f
Fix Email Notification During Order Refund (#2200)
May 8, 2017
90d5fb8
1638 Completed Order Logged Out State (#2201)
abdulsemiu-atanda May 8, 2017
c672868
fix create product should flip into edit mode (#2221)
abdulsemiu-atanda May 9, 2017
1b1e0ca
Toggle Variant Visibility when Ancestor Product Visibility is Toggled…
May 9, 2017
90bfd6b
Fix missing shop (#2224)
jshimko May 9, 2017
78901a9
swap unicode with missing semi-colon for regular apostrophe (#2223)
kieckhafer May 9, 2017
dfa806e
made social share buttons on PDP ADA compliant (#2196)
minimart May 9, 2017
e8151a1
Fix permissions for items shown in admin dashboard (#2145)
impactmass May 9, 2017
e97a032
Pin vsivsi:job-collection meteor package to 1.4.0 (#2228)
hrath2015 May 9, 2017
8887269
React Router (#2123)
mikemurray May 9, 2017
ad0f8d9
LingoHub based on development (#2218)
May 10, 2017
a731478
2217 Add Product Name To Invoice (#2226)
abdulsemiu-atanda May 10, 2017
f1306aa
Permissions Fix: Use passed in "audience" param in ReactionApps (#2235)
impactmass May 11, 2017
3529f9c
fix display of unpublished option images (#2236)
abdulsemiu-atanda May 11, 2017
a6cc84f
Restore helper to limit dropdown icons
impactmass May 11, 2017
e368543
Merge pull request #2253 from reactioncommerce/revert-dropdowns-2252
spencern May 11, 2017
4de6b06
1987 Panel Expander Arrow Overlapping on Dropdown (#2211)
abdulsemiu-atanda May 11, 2017
b0b201c
Fixes #2243 Paypal Express requiring login for guest accounts (#2255)
spencern May 12, 2017
07e4962
Updated README.md
May 12, 2017
45e524f
Update version
May 12, 2017
5ce8394
Merge branch 'development' into brent-fix-issue-2104
brent-hoover May 14, 2017
749bd36
readme.md updates
kieckhafer May 16, 2017
638b525
Removed unused code
mikemurray May 16, 2017
cd598b4
Merge pull request #2282 from reactioncommerce/mikemurray-patch-1
kieckhafer May 16, 2017
f4f7f61
fix 2278 Router tables not initializing (#2279)
hrath2015 May 16, 2017
650679b
fix notification dropdown links (#2280)
kieckhafer May 16, 2017
f735548
style / small updates for release 1.2 (#2283)
kieckhafer May 16, 2017
574dd47
Merge branch 'master' into development
May 17, 2017
742cf7e
fix multiple refunds for stripe (#2260)
May 17, 2017
712e612
Simplify core layout component (#2257)
mikemurray May 17, 2017
2ed4223
2203 Long Strings Handling in Product Option Title (#2266)
abdulsemiu-atanda May 17, 2017
6146a33
change shipping / payment error messages in checkout (#2271)
kieckhafer May 17, 2017
c2ddb98
Add the Vietnamese Dong as a supported currency (#2248)
fuo May 17, 2017
fa08398
Re-introduce icon toolbar as shortcutBar (#2261)
mikemurray May 17, 2017
d5c764b
fix issue (#2276)
May 18, 2017
ddd2b32
allow loader to show when one is passed in and defined BUGFIX (#2303)
Pheonix7284 May 18, 2017
eb7d14c
Change customer notification message when order is processed. (#2290)
May 22, 2017
b8a5bb4
i18n translation updates (#2302)
kieckhafer May 22, 2017
d725c7e
CircleCI 2.0 and docker base update (#2334)
jshimko May 23, 2017
de48f0b
Merge branch 'development' into brent-fix-issue-2104
brent-hoover May 24, 2017
7e330d9
More and more style changes
brent-hoover May 24, 2017
b64a5d2
Add Verification Url to Welcome Email (#2216)
May 24, 2017
776dcc4
fix issue(refunds not showing) (#2317)
May 24, 2017
461c5b8
fix conditional in Circle deploy script (#2338)
jshimko May 24, 2017
b5d3952
don’t load any other fixtures until the default shop is loaded (#2329)
jshimko May 24, 2017
7c5f24a
allow a MAIL_URL string without auth (#2330)
jshimko May 24, 2017
82b92d9
add loading component to fix error (#2340)
kieckhafer May 25, 2017
4729320
Use proper color variables
brent-hoover May 25, 2017
31c0349
Create proper behaviors
brent-hoover May 25, 2017
62b9c45
Merge branch 'development' into brent-fix-issue-2104
brent-hoover May 25, 2017
1de63a3
Fix bad evaluation
brent-hoover May 25, 2017
e263769
Fix import order
brent-hoover May 25, 2017
239680d
Add i18n
brent-hoover May 25, 2017
c750e48
color updates for styleguide (#2339)
kieckhafer May 25, 2017
dc6c484
Updated text colors
rymorgan May 25, 2017
c3f07c6
Merge pull request #2350 from reactioncommerce/ryan-missed-color
kieckhafer May 25, 2017
c72247a
Don't throwback a step if tax fails
brent-hoover May 25, 2017
f5fecc9
fix testing issue #2348 (#2349)
hrath2015 May 26, 2017
0d069d7
Make this more of an "exception" flag
brent-hoover May 26, 2017
84df772
Better handling for unique routes for React Router (#2327)
mikemurray May 30, 2017
bb306e5
Fix git tagging on CircleCI 2.0 (#2362)
jshimko May 30, 2017
5607ad1
Updated colors
mikemurray May 30, 2017
bd4edb8
Merge pull request #2369 from reactioncommerce/add-more-colors
kieckhafer May 30, 2017
87ed563
React unit testing example (#2170)
joykare May 31, 2017
b98977b
Fix typo in inventory test description (#2364)
hrath2015 May 31, 2017
5b446c7
CollectionFS cfs:tempstore and cfs:worker to fix concurrency issues …
lcampanis Jun 4, 2017
eef7f18
Correct the way we record tax overrides
brent-hoover Jun 5, 2017
9cfe6e8
[WIP] Meteor 1.5 (#2371)
Jun 7, 2017
6d88f3c
Declare variable (#2401)
brent-hoover Jun 8, 2017
133e764
Implement missing router functions (#2393)
mikemurray Jun 8, 2017
ea5aa34
2332 Fix Improper Cart Merge (#2387)
abdulsemiu-atanda Jun 8, 2017
278756a
Change line width to match GH PR review width (#2407)
brent-hoover Jun 8, 2017
bcd7d1d
Orders updates (#2400)
kieckhafer Jun 8, 2017
f3ca0d4
use route permissions in register.js files (#2388)
Jun 8, 2017
1e4d7fc
Milestone 54 / Convert Navbar to React (#2306)
brent-hoover Jun 8, 2017
6e45ad6
Merge branch 'development' into brent-fix-issue-2104
brent-hoover Jun 8, 2017
a0b44da
import order
kieckhafer Jun 8, 2017
d202a0a
Merge pull request #2162 from reactioncommerce/brent-fix-issue-2104
kieckhafer Jun 8, 2017
18d45a2
remove duplicate babel preset packages
jshimko Jun 9, 2017
42ffc56
Merge pull request #2415 from reactioncommerce/fix-duplicate-packages
kieckhafer Jun 9, 2017
73274c9
Updated yarn.lock and removed npm-shrinkwrap.json
Jun 9, 2017
da41bc0
Admin should be able to invite a user with the same name (#2386)
Jun 12, 2017
754e66b
Merge branch 'master' into development
Jun 12, 2017
c8409ff
Update version
Jun 13, 2017
9858361
switch to Reaction’s new fork of Nodemailer (#2427)
jshimko Jun 13, 2017
4512d75
Added module aliases (#2436)
mikemurray Jun 15, 2017
352c98d
LingoHub Update :rocket: (#2420)
Jun 16, 2017
43e0a60
Add css style to differentiate read from unread notifications (#2442)
Jun 16, 2017
b2b8e7f
Remove acceptance tests (#2430)
brent-hoover Jun 16, 2017
5d0fc79
Fixed console error when dragging product images (#2443)
rhenshaw56 Jun 16, 2017
e4bade3
Add closeOnClick option to DropDownMenu component (#2418)
spencern Jun 16, 2017
6d50cea
add missing "orders not found" text (#2424)
kieckhafer Jun 17, 2017
c5ee98a
Merge branch 'development' into Release-1.3.0
Jun 17, 2017
f7aa04b
Updated chai package
Jun 17, 2017
4efb14e
Merge branch 'Release-1.3.0' into development
Jun 17, 2017
dd0a77b
Bunyan and Loggly updates (#2425)
jshimko Jun 19, 2017
b64ee84
refactor default admin user creation (#2453)
jshimko Jun 19, 2017
72d1ad3
update memory usage in CircleCI build (#2462)
jshimko Jun 19, 2017
25e8942
Navbar hover issue (#2451)
rhenshaw56 Jun 20, 2017
cea9557
set css property overflow on horizontal to hidden (#2458)
rhenshaw56 Jun 20, 2017
1d0fd64
[WIP] 2452 fix on UI icon toolbar (#2460)
rhenshaw56 Jun 20, 2017
1a6a8f3
[WIP] 2356 fix on tag menu-sidebar glitch (#2472)
rhenshaw56 Jun 20, 2017
b59263b
update media gallery new / deleted image indicators (#2469)
kieckhafer Jun 20, 2017
c9a0b28
Remove random regex checks on names. Fixes #2461 (#2471)
brent-hoover Jun 20, 2017
670ee6b
remove older Blaze based launchdock plugin (#2467)
jshimko Jun 20, 2017
e87ea72
2459 router range error fix (#2476)
prosf Jun 20, 2017
c737ac9
2422 Fix on email invite link leading to blank screen (#2437)
rhenshaw56 Jun 21, 2017
c27f70e
Update current user's name on Navbar and profile page when address is…
Jun 21, 2017
d86ec6f
Define missing options variable
Jun 21, 2017
3144dc3
Updated dependencies (#2463)
Jun 21, 2017
7a971b0
Merge branch 'development' into Release-1.3.0
Jun 21, 2017
a7fec91
add a more flexible case insensitive match to CI branch checks (#2484)
jshimko Jun 21, 2017
3f252fe
Revert minifier to abernix fork (#2486)
jshimko Jun 22, 2017
c2a72ce
Merge branch 'development' into Release-1.3.0
Jun 22, 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
  •  
  •  
  •  
4 changes: 0 additions & 4 deletions .babelrc

This file was deleted.

1 change: 0 additions & 1 deletion .bithoundrc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"mute": [
"wdio-mocha-framework",
"griddle-react",
"nodemailer",
"twilio",
"react-addons-create-fragment",
"react-addons-pure-render-mixin",
Expand Down
28 changes: 28 additions & 0 deletions .circleci/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/bash

set -e

DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}

shopt -s nocasematch

# if we're not on a deployment branch or a Docker/Release related PR branch, skip the Docker build/test
if ! [[ "$CIRCLE_BRANCH" == "master" || "$CIRCLE_BRANCH" == "development" ||
"$CIRCLE_BRANCH" =~ "docker" || "$CIRCLE_BRANCH" =~ "release" ]]; then
echo "Not running a Docker build test branch. Skipping the build."
exit 0
fi

# build new image
docker build --build-arg TOOL_NODE_FLAGS="--max-old-space-size=4096" -t reactioncommerce/reaction:latest .

# run the container and wait for it to boot
docker-compose -f .circleci/docker-compose.yml up -d
sleep 30

# use curl to ensure the app returns 200's
docker exec reaction bash -c "apt-get update && apt-get install -y curl && \
curl --retry 10 --retry-delay 10 -v http://localhost:3000"

# now change the image tag to the configured name
docker tag reactioncommerce/reaction:latest $DOCKER_NAMESPACE:latest
56 changes: 56 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
version: 2

jobs:
build:
working_directory: /home/reaction

docker:
- image: node:7

environment:
- DOCKER_VERSION: 17.03.1-ce
- DOCKER_COMPOSE_VERSION: 1.13.0
- METEOR_ALLOW_SUPERUSER: true

steps:
- setup_remote_docker
- checkout

# install OS dependencies
- restore_cache:
name: Restoring Meteor cache
key: meteor

- run: .circleci/install.sh

- save_cache:
name: Saving Meteor to cache
key: meteor
paths:
- ~/.meteor

# install app dependencies

- run: meteor npm install

# run tests
- restore_cache:
name: Restoring Meteor dev_bundle cache
key: dev_bundle

- run: npm test
- run: reaction test


- save_cache:
name: Saving Meteor dev_bundle to cache
key: dev_bundle
paths:
- /home/reaction/.meteor/local

- run: .circleci/build.sh

# deploy the build (if on a deployment branch)
- deploy:
name: Docker Image Deploment
command: .circleci/deploy.sh
59 changes: 59 additions & 0 deletions .circleci/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/bin/bash

## 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 CircleCI config)
#
# $DOCKER_NAMESPACE - the image name for production deployments [Default]: reactioncommerce/reaction
# $DOCKER_NAMESPACE_DEV - the image name for development deployments [Default]: reactioncommerce/prequel


if [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != "development" ]]; then
echo "Not running a deployment branch."
exit 0
fi


## Development
if [[ "$CIRCLE_BRANCH" == "development" ]]; then
set -e

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
fi


# Master branch deployment (only runs when a version git tag exists - syntax: "v1.2.3")
if [[ "$CIRCLE_BRANCH" == "master" ]]; then
VERSION=$(git describe --tags | grep "^v[0-9]\+\.[0-9]\+\.[0-9]\+$")

if [[ "$VERSION" ]]; then
set -e

DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}

docker tag $DOCKER_NAMESPACE:latest $DOCKER_NAMESPACE:$VERSION

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

docker push $DOCKER_NAMESPACE:$VERSION
docker push $DOCKER_NAMESPACE:latest
else
echo "On the master branch, but no version tag was found. Skipping image deployment."
fi
fi
17 changes: 17 additions & 0 deletions .circleci/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Usage:
# docker-compose up -d

reaction:
container_name: reaction
image: reactioncommerce/reaction:latest
links:
- mongo
ports:
- "3000:3000"
environment:
ROOT_URL: "http://localhost"
MONGO_URL: "mongodb://mongo:27017/reaction"

mongo:
image: mongo:latest
command: mongod --storageEngine=wiredTiger
39 changes: 39 additions & 0 deletions .circleci/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/bin/bash

set -x

# install OS dependencies
apt-get update
apt-get install -y locales


# fix Meteor/Mongo locale issue on Debian
# https://github.com/meteor/meteor/issues/4019
locale-gen en_US.UTF-8
localedef -i en_GB -f UTF-8 en_US.UTF-8


# install Docker client
curl -L -o /tmp/docker-$DOCKER_VERSION.tgz https://get.docker.com/builds/Linux/x86_64/docker-$DOCKER_VERSION.tgz
tar -xz -C /tmp -f /tmp/docker-$DOCKER_VERSION.tgz
mv /tmp/docker/* /usr/bin
docker -v


# install Docker Compose
curl -L https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose


# install Meteor if it's not already
if [[ -f ~/.meteor/meteor ]]; then
printf "\nMeteor already installed. Creating symlink.\n"
ln -s ~/.meteor/meteor /usr/local/bin/meteor;
else
printf "\Installing Meteor\n"
curl https://install.meteor.com | /bin/sh
fi


# install Reaction CLI
yarn global add reaction-cli
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ insert_final_newline = true
trim_trailing_whitespace = false

[*.js]
max_line_length = 160
max_line_length = 120
indent_brace_style = 1TBS
spaces_around_operators = true
quote_type = double
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"args": "after-used"
}],
"no-use-before-define": [2, "nofunc"], // http://eslint.org/docs/rules/no-use-before-define
"no-implicit-globals": 2, // http://eslint.org/docs/rules/no-implicit-globals

/**
* Possible errors
Expand Down
1 change: 1 addition & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ notices-for-facebook-graph-api-2
1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
34 changes: 16 additions & 18 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
# Core Meteor Packages
###

meteor-base@1.0.4 # Packages every Meteor app needs to have
meteor-base@1.1.0 # Packages every Meteor app needs to have
[email protected] # Packages for a great mobile UX
[email protected] # Compile .html files into Meteor Blaze views
[email protected] # ECMAScript 5 compatibility for older browsers.
ecmascript@0.7.3 # Enable ECMAScript2015+ syntax in app code
ecmascript@0.8.0 # 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)
abernix:standard-minifier-js # a minifier plugin used for Meteor apps by default
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].17
[email protected].18
[email protected]
[email protected]
[email protected].8
[email protected].9
[email protected]
[email protected]
[email protected]
Expand All @@ -34,17 +34,19 @@ [email protected]
amplify
mdg:validated-method
[email protected]
dynamic-import

# Meteor Auth Packages
accounts-base@1.2.17
accounts-base@1.3.0
[email protected]
accounts-facebook@1.1.1
accounts-google@1.1.2
accounts-twitter@1.2.1
accounts-facebook@1.2.0
accounts-google@1.2.0
accounts-twitter@1.3.0
[email protected]
# accounts-github
# accounts-weibo
# accounts-oauth
[email protected]
[email protected]
[email protected]


# Community Packages
alanning:roles
Expand All @@ -59,7 +61,6 @@ cfs:standard-packages
cfs:storage-adapter
cfs:ui
dispatch:run-as-user
jeremy:stripe
jparker:gravatar
juliancwirko:s-alert
juliancwirko:s-alert-stackslide
Expand All @@ -72,8 +73,8 @@ ongoworks:security
raix:ui-dropped-event
risul:moment-timezone
tmeasday:publish-counts
vsivsi:[email protected]
react-meteor-data
vsivsi:job-collection@=1.4.0
react-meteor-data@=0.2.9
percolate:migrations
gadicc:blaze-react-component

Expand All @@ -94,6 +95,3 @@ johanbrook:publication-collector
# meteorhacks:sikka # additional ddp, login security

# Custom Packages
[email protected]
[email protected]
[email protected]
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.4.4.2
METEOR@1.5
Loading