From 46b7d7f0955b89d7ab779f520f97bd81409011c3 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Tue, 13 Oct 2015 23:39:29 -0500 Subject: [PATCH 01/13] updated packages, add meteor auth packages - add auth packages in .meteor/packages so that they are optional --- .meteor/packages | 10 +++++++++- .meteor/versions | 29 +++++++++++++---------------- bin/docker/build-themes.sh | 2 +- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 871968d..e7d96e0 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -28,11 +28,19 @@ check underscore less oauth-encryption -accounts-facebook audit-argument-checks spiderable nemo64:bootstrap +# Meteor Auth Packages + +accounts-facebook +accounts-google +accounts-twitter +accounts-github +accounts-weibo +accounts-oauth + # Reaction Commerce Packages reactioncommerce:core diff --git a/.meteor/versions b/.meteor/versions index b8b7a41..5b61bcc 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -7,13 +7,11 @@ accounts-password@1.1.3 accounts-twitter@1.0.6 accounts-weibo@1.0.6 alanning:roles@1.2.14 -aldeed:autoform@5.6.0 +aldeed:autoform@5.7.1 aldeed:collection2@2.5.0 aldeed:simple-schema@1.3.3 aldeed:template-extension@3.4.3 amplify@1.0.0 -anti:i18n@0.4.3 -aslagle:reactive-table@0.8.15 audit-argument-checks@1.0.4 autoupdate@1.2.3 babel-compiler@5.8.24_1 @@ -46,7 +44,7 @@ cfs:power-queue@0.9.11 cfs:reactive-list@0.0.9 cfs:reactive-property@0.0.4 cfs:standard-packages@0.5.9 -cfs:storage-adapter@0.2.2 +cfs:storage-adapter@0.2.3 cfs:tempstore@0.1.5 cfs:ui@0.1.3 cfs:upload-http@0.0.20 @@ -79,14 +77,14 @@ html-tools@1.0.5 htmljs@1.0.5 http@1.1.1 id-map@1.0.4 -iron:controller@1.0.8 -iron:core@1.0.8 -iron:dynamic-template@1.0.8 -iron:layout@1.0.8 -iron:location@1.0.9 -iron:middleware-stack@1.0.10 -iron:router@1.0.10 -iron:url@1.0.9 +iron:controller@1.0.12 +iron:core@1.0.11 +iron:dynamic-template@1.0.12 +iron:layout@1.0.12 +iron:location@1.0.11 +iron:middleware-stack@1.0.11 +iron:router@1.0.12 +iron:url@1.0.11 jparker:crypto-core@0.1.0 jparker:crypto-md5@0.1.1 jparker:gravatar@0.3.1 @@ -122,7 +120,6 @@ oauth2@1.1.5 observe-sequence@1.0.7 ongoworks:bunyan-logger@2.5.0 ongoworks:security@1.3.0 -ongoworks:speakingurl@5.0.1 ordered-dict@1.0.4 promise@0.5.0 raix:eventemitter@0.1.3 @@ -130,15 +127,15 @@ raix:ui-dropped-event@0.0.7 random@1.0.4 rate-limit@1.0.0 reactioncommerce:bootstrap-theme@1.7.0 -reactioncommerce:core@0.9.0 +reactioncommerce:core@0.9.2 reactioncommerce:core-theme@1.8.0 -reactioncommerce:reaction-accounts@1.2.0 +reactioncommerce:reaction-accounts@1.5.0 reactioncommerce:reaction-analytics@1.1.0 reactioncommerce:reaction-analytics-libs@1.1.0 reactioncommerce:reaction-paypal@1.2.0 reactioncommerce:reaction-shipping@0.6.0 reactioncommerce:reaction-social@0.4.0 -reactioncommerce:reaction-stripe@2.2.0 +reactioncommerce:reaction-stripe@3.0.0 reactive-dict@1.1.2 reactive-var@1.0.6 reload@1.1.4 diff --git a/bin/docker/build-themes.sh b/bin/docker/build-themes.sh index 2f733df..ea7dd05 100755 --- a/bin/docker/build-themes.sh +++ b/bin/docker/build-themes.sh @@ -13,7 +13,7 @@ if [ ! -f client/themes/bootstrap/custom.reaction.less ]; then echo "info: using development mode in an attempt to create missing files." echo "info: this can take 2-5 minutes. be patient." # startup development server - command="env -i HOME="$HOME" LC_CTYPE="${LC_ALL:-${LC_CTYPE:-$LANG}}" PATH="$PATH" USER="$USER" /usr/local/bin/meteor" + command="env -i HOME="$HOME" LC_ALL=en_US.UTF-8 LC_CTYPE="${LC_ALL:-${LC_CTYPE:-$LANG}}" PATH="$PATH" USER="$USER" /usr/local/bin/meteor" log=".build.log" match="=> Client modified -- refreshing" From fe2c88805967891c1709e580c6fc148eb2fcddd6 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Wed, 14 Oct 2015 01:09:01 -0500 Subject: [PATCH 02/13] updated dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - use older mongo 2.6 to ensure build works doesn’t encounter unexpected mongo setup errors --- .meteor/versions | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index 5b61bcc..1a37c55 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -135,7 +135,7 @@ reactioncommerce:reaction-analytics-libs@1.1.0 reactioncommerce:reaction-paypal@1.2.0 reactioncommerce:reaction-shipping@0.6.0 reactioncommerce:reaction-social@0.4.0 -reactioncommerce:reaction-stripe@3.0.0 +reactioncommerce:reaction-stripe@2.2.0 reactive-dict@1.1.2 reactive-var@1.0.6 reload@1.1.4 diff --git a/Dockerfile b/Dockerfile index 740d182..b18382c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ # ############################################################## -FROM mongo:latest +FROM mongo:2.6 MAINTAINER Aaron Judd From f73796ef2b920724481e77d9374f95e970eab342 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Thu, 15 Oct 2015 11:02:10 -0500 Subject: [PATCH 03/13] updated fixtures doc with full example - include example reaction config file in private/settings --- docs/developer/fixtures.md | 97 +++++++++++++++++++++++--- private/settings/reaction.json.example | 91 ++++++++++++++++++++++++ 2 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 private/settings/reaction.json.example diff --git a/docs/developer/fixtures.md b/docs/developer/fixtures.md index 6fc2faa..202304b 100644 --- a/docs/developer/fixtures.md +++ b/docs/developer/fixtures.md @@ -84,19 +84,100 @@ See [the packages development documentation](https://github.com/reactioncommerce The `Fixtures.loadSettings` method makes it easy to update Reaction package settings on startup. To use, create the app file: `private/settings/reaction.json` with package settings. +Note: _Where `name` is Reaction package name, the `settings` object will update the `Packages` collection on every restart/reload._ + Example _private/settings/reaction.json_ ```json [ - { - "name": "reaction-paypal", - "settings": { - "mode": false, - "client_id": "", - "client_secret": " Date: Thu, 15 Oct 2015 11:05:13 -0500 Subject: [PATCH 04/13] updated Dockerfile, build packages --- .meteor/versions | 14 +++++++------- Dockerfile | 13 ++++++++++--- bin/docker/build-themes.sh | 2 +- circle.yml | 6 ++++++ 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index 1a37c55..07ced12 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -107,7 +107,7 @@ momentjs:moment@2.10.6 mongo@1.1.2 mongo-id@1.0.1 mongo-livedata@1.0.9 -mquandalle:bower@1.5.2 +mquandalle:bower@1.5.2_1 nemo64:bootstrap@3.3.5_2 nemo64:bootstrap-data@3.3.5 npm-bcrypt@0.7.8_2 @@ -129,13 +129,13 @@ rate-limit@1.0.0 reactioncommerce:bootstrap-theme@1.7.0 reactioncommerce:core@0.9.2 reactioncommerce:core-theme@1.8.0 -reactioncommerce:reaction-accounts@1.5.0 -reactioncommerce:reaction-analytics@1.1.0 +reactioncommerce:reaction-accounts@1.5.1 +reactioncommerce:reaction-analytics@1.1.1 reactioncommerce:reaction-analytics-libs@1.1.0 -reactioncommerce:reaction-paypal@1.2.0 -reactioncommerce:reaction-shipping@0.6.0 -reactioncommerce:reaction-social@0.4.0 -reactioncommerce:reaction-stripe@2.2.0 +reactioncommerce:reaction-paypal@1.2.2 +reactioncommerce:reaction-shipping@0.6.1 +reactioncommerce:reaction-social@0.4.1 +reactioncommerce:reaction-stripe@3.0.1 reactive-dict@1.1.2 reactive-var@1.0.6 reload@1.1.4 diff --git a/Dockerfile b/Dockerfile index b18382c..273b5a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,12 +40,14 @@ # ############################################################## -FROM mongo:2.6 +FROM mongo:3.0 MAINTAINER Aaron Judd - ENV DEBIAN_FRONTEND noninteractive +# https://github.com/meteor/meteor/issues/4019 +# ENV LC_ALL C + # Install git, curl, python, etc # Install imagemagick (optional for cfs:graphicsmagick) RUN apt-get -qq update && apt-get install -qq -y \ @@ -74,8 +76,12 @@ RUN apt-get install -y nodejs # Install forever & phantomjs RUN npm install --silent -g phantomjs nodemon +# https://github.com/meteor/meteor/wiki/File-Change-Watcher-Efficiency +# will only work if docker run in priviledged mode +# RUN echo fs.inotify.max_user_watches=524288 | tee -a /etc/sysctl.conf && sysctl -p + # Install Meteor -RUN curl https://install.meteor.com | /bin/sh +RUN curl -sL https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh # Default (required) Meteor env variables ENV PORT 80 @@ -104,6 +110,7 @@ RUN mkdir -p /var/www RUN chown -R www-data:www-data /var/www # add app to /usr/src +# VOLUME ["/usr/src/meteor"] VOLUME ["/data/db"] COPY . /usr/src/meteor WORKDIR /usr/src/meteor/ diff --git a/bin/docker/build-themes.sh b/bin/docker/build-themes.sh index ea7dd05..5ecd746 100755 --- a/bin/docker/build-themes.sh +++ b/bin/docker/build-themes.sh @@ -13,7 +13,7 @@ if [ ! -f client/themes/bootstrap/custom.reaction.less ]; then echo "info: using development mode in an attempt to create missing files." echo "info: this can take 2-5 minutes. be patient." # startup development server - command="env -i HOME="$HOME" LC_ALL=en_US.UTF-8 LC_CTYPE="${LC_ALL:-${LC_CTYPE:-$LANG}}" PATH="$PATH" USER="$USER" /usr/local/bin/meteor" + command="env -i MONGO_URL="" HOME="$HOME" LC_ALL="C" PATH="$PATH" USER="$USER" /usr/local/bin/meteor --allow-incompatible-update" log=".build.log" match="=> Client modified -- refreshing" diff --git a/circle.yml b/circle.yml index 12e9468..b9aee16 100644 --- a/circle.yml +++ b/circle.yml @@ -30,3 +30,9 @@ deployment: commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - docker push reactioncommerce/prequel + hub: + branch: master + commands: + - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + - docker rename reactioncommerce/prequel reactioncommerce/reaction + - docker push reactioncommerce/reaction From c0c71f653b22fd06f95165ed64ac1fe97261a264 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Thu, 15 Oct 2015 11:23:03 -0500 Subject: [PATCH 05/13] update to velocity:METEOR@1.2.0.2_1 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index b9aee16..31e9bfe 100644 --- a/circle.yml +++ b/circle.yml @@ -20,7 +20,7 @@ dependencies: test: override: - cd $HOME/reaction - - VELOCITY_TEST_PACKAGES=1 meteor test-packages --driver-package velocity:html-reporter --velocity --release velocity:METEOR@1.1.0.3_2 + - VELOCITY_TEST_PACKAGES=1 meteor test-packages --driver-package velocity:html-reporter --velocity --release velocity:METEOR@1.2.0.2_1 - docker run -d -p :80:80 reactioncommerce/prequel; sleep 10 - curl --retry 10 --retry-delay 5 -v http://localhost From 3299cc6a7d1caa685733b19991a1a8dae7271ce6 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Thu, 15 Oct 2015 11:50:32 -0500 Subject: [PATCH 06/13] updated circle.yml --- circle.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/circle.yml b/circle.yml index 31e9bfe..d18f79b 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,6 @@ machine: dependencies: cache_directories: - "~/.meteor" - override: - cd $HOME/reaction - chmod +x bin/clone-packages.sh @@ -30,7 +29,6 @@ deployment: commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - docker push reactioncommerce/prequel - hub: branch: master commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS From 68a1a5938f9b4cbeedcbfd9c4e39d1c2cfefecb6 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Thu, 15 Oct 2015 12:37:03 -0500 Subject: [PATCH 07/13] updated circle.yml --- circle.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index d18f79b..d715f25 100644 --- a/circle.yml +++ b/circle.yml @@ -24,13 +24,15 @@ test: - curl --retry 10 --retry-delay 5 -v http://localhost deployment: - hub: + prequel: branch: development commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - - docker push reactioncommerce/prequel + - docker tag reactioncommerce/prequel reactioncommerce/prequel:$CIRCLE_BUILD_NUM + - docker push reactioncommerce/prequel:$CIRCLE_BUILD_NUM + release: branch: master commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - - docker rename reactioncommerce/prequel reactioncommerce/reaction - - docker push reactioncommerce/reaction + - docker tag reactioncommerce/prequel reactioncommerce/reaction:$CIRCLE_BUILD_NUM + - docker push reactioncommerce/reaction:$CIRCLE_BUILD_NUM From 8123e37bd4531fbee6c141ce2931307b6681d480 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Mon, 19 Oct 2015 09:57:09 -0500 Subject: [PATCH 08/13] updated package docs - fix PACKAGES_DIR to PACKAGE_DIRS --- .meteor/versions | 2 +- docs/developer/packages.md | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index 07ced12..6493c51 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -127,7 +127,7 @@ raix:ui-dropped-event@0.0.7 random@1.0.4 rate-limit@1.0.0 reactioncommerce:bootstrap-theme@1.7.0 -reactioncommerce:core@0.9.2 +reactioncommerce:core@0.9.3 reactioncommerce:core-theme@1.8.0 reactioncommerce:reaction-accounts@1.5.1 reactioncommerce:reaction-analytics@1.1.1 diff --git a/docs/developer/packages.md b/docs/developer/packages.md index f2217dd..2abe383 100644 --- a/docs/developer/packages.md +++ b/docs/developer/packages.md @@ -9,23 +9,25 @@ Reaction packages are Meteor packages that add a call to `ReactionCore.registerP - [Permissions](#permissions) - [Owner](#owner) - [Admin](#admin) -- [Dashboard](#dashboard) -- [Routes](#routes) -- [Collections](#collections) -- [Security](#security) -- [Publishing](#publishing) + - [Dashboard](#dashboard) + - [Routes](#routes) + - [Collections](#collections) + - [Security](#security) + - [Publishing](#publishing) ## Core Packages -For local core package development you must _git clone_ packages locally, either into `reaction/packages`, or define the `PACKAGES_DIR` env variable for an alternate location. +For local core package development you must _git clone_ packages locally, either into `reaction/packages`, or define the `PACKAGE_DIRS` env variable for an alternate location. -The `bin/clone-packages.sh` is a helper script that will clone all current reactioncommerce:* packages into the PACKAGES_DIR location. +The `bin/clone-packages.sh` is a helper script that will clone all current reactioncommerce:* packages into the PACKAGE_DIRS location. -First set your PACKAGES_DIR variable: +First set your PACKAGE_DIRS variable: ```bash -export PACKAGES_DIR="~/reaction/packages" +export PACKAGE_DIRS="/Users/path/to/your/packages" ``` +By default, if the `PACKAGE_DIRS` ENV variable is not set, we'll assume `PACKAGE_DIRS="~/reaction/packages"`. + Checkout Reaction and execute `clone-packages.sh`. ```bash @@ -98,6 +100,8 @@ _Tip: You can also add and remove packages by editing `.meteor/packages`_ ### ReactionCore.registerPackage The `ReactionCore.registerPackage` method describes a Meteor package to other Reaction packages. +Note: The registry entries load does not overwrite existing package entries in the `Packages` collection. However, if there is a package settings object, these entries will be refreshed on change. You'll need to either clear the `Packages` collection, or do a `meteor reset` to re-write other changes to a package registry entry. + Integrate packages with reaction-core by adding **server/register.js** ```javascript @@ -135,7 +139,7 @@ ReactionCore.registerPackage({ ``` #### Registry -The registry is used to settings, routes, and permissions for Reaction specific packages. +The registry is used to add settings, routes, and permissions for Reaction specific packages. A `registry` object can be any combination of properties, with `provides` being the only required element. From 28f2ef9e2920ac8c30c7ef79add5848c231e9837 Mon Sep 17 00:00:00 2001 From: Erik Eppel Date: Sat, 24 Oct 2015 13:26:35 -0700 Subject: [PATCH 09/13] Changes file name in meteor command to 'dev.settings.json' --- docs/developer/packages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer/packages.md b/docs/developer/packages.md index 2abe383..a91c5c2 100644 --- a/docs/developer/packages.md +++ b/docs/developer/packages.md @@ -35,7 +35,7 @@ cd ~ git clone https://github.com/reactioncommerce/reaction.git cd reaction ./bin/clone-packages.sh -meteor --settings settings/dev-settings.json +meteor --settings settings/dev.settings.json ``` This is our recommended practice, and ensure you are working with the default branches (development) for all the Reaction packages. From 08bcbfc1d3624905078203417b957a033ed53d51 Mon Sep 17 00:00:00 2001 From: aaronjudd Date: Tue, 27 Oct 2015 10:55:54 -0700 Subject: [PATCH 10/13] METEOR@1.2.1 --- .meteor/release | 2 +- .meteor/versions | 66 ++++++++++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 26 deletions(-) diff --git a/.meteor/release b/.meteor/release index 5684262..3a05e0a 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.2.0.2 +METEOR@1.2.1 diff --git a/.meteor/versions b/.meteor/versions index 6493c51..33e4a6e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,9 +1,9 @@ -accounts-base@1.2.1 +accounts-base@1.2.2 accounts-facebook@1.0.6 accounts-github@1.0.6 accounts-google@1.0.6 -accounts-oauth@1.1.7 -accounts-password@1.1.3 +accounts-oauth@1.1.8 +accounts-password@1.1.4 accounts-twitter@1.0.6 accounts-weibo@1.0.6 alanning:roles@1.2.14 @@ -13,7 +13,7 @@ aldeed:simple-schema@1.3.3 aldeed:template-extension@3.4.3 amplify@1.0.0 audit-argument-checks@1.0.4 -autoupdate@1.2.3 +autoupdate@1.2.4 babel-compiler@5.8.24_1 babel-runtime@0.1.4 base64@1.0.4 @@ -49,29 +49,29 @@ cfs:tempstore@0.1.5 cfs:ui@0.1.3 cfs:upload-http@0.0.20 cfs:worker@0.1.4 -check@1.0.6 -coffeescript@1.0.10 -cosmos:browserify@0.3.0 +check@1.1.0 +coffeescript@1.0.11 +cosmos:browserify@0.8.1 d3js:d3@3.5.5 dburles:factory@0.3.10 ddp@1.2.2 ddp-client@1.2.1 -ddp-common@1.2.1 +ddp-common@1.2.2 ddp-rate-limiter@1.0.0 -ddp-server@1.2.1 +ddp-server@1.2.2 deps@1.0.9 diff-sequence@1.0.1 -ecmascript@0.1.5 -ecmascript-collections@0.1.6 +ecmascript@0.1.6 +ecmascript-runtime@0.2.6 ejson@1.0.7 -email@1.0.7 -es5-shim@4.1.13 +email@1.0.8 +es5-shim@4.1.14 facebook@1.2.2 fastclick@1.0.7 fortawesome:fontawesome@4.4.0 geojson-utils@1.0.4 github@1.1.4 -google@1.1.6 +google@1.1.7 hot-code-push@1.0.0 html-tools@1.0.5 htmljs@1.0.5 @@ -90,21 +90,21 @@ jparker:crypto-md5@0.1.1 jparker:gravatar@0.3.1 jquery@1.11.4 launch-screen@1.0.4 -less@2.5.0_3 +less@2.5.1 livedata@1.0.15 localstorage@1.0.5 logging@1.0.8 matb33:collection-hooks@0.8.1 -meteor@1.1.9 +meteor@1.1.10 meteor-base@1.0.1 meteorhacks:inject-initial@1.0.2 -meteorhacks:ssr@2.1.2 +meteorhacks:ssr@2.2.0 minifiers@1.1.7 minimongo@1.0.10 mobile-experience@1.0.1 mobile-status-bar@1.0.6 momentjs:moment@2.10.6 -mongo@1.1.2 +mongo@1.1.3 mongo-id@1.0.1 mongo-livedata@1.0.9 mquandalle:bower@1.5.2_1 @@ -121,13 +121,16 @@ observe-sequence@1.0.7 ongoworks:bunyan-logger@2.5.0 ongoworks:security@1.3.0 ordered-dict@1.0.4 -promise@0.5.0 +package-version-parser@3.0.4 +practicalmeteor:chai@2.1.0_1 +practicalmeteor:loglevel@1.2.0_2 +promise@0.5.1 raix:eventemitter@0.1.3 raix:ui-dropped-event@0.0.7 -random@1.0.4 +random@1.0.5 rate-limit@1.0.0 reactioncommerce:bootstrap-theme@1.7.0 -reactioncommerce:core@0.9.3 +reactioncommerce:core@0.9.4 reactioncommerce:core-theme@1.8.0 reactioncommerce:reaction-accounts@1.5.1 reactioncommerce:reaction-analytics@1.1.1 @@ -136,12 +139,17 @@ reactioncommerce:reaction-paypal@1.2.2 reactioncommerce:reaction-shipping@0.6.1 reactioncommerce:reaction-social@0.4.1 reactioncommerce:reaction-stripe@3.0.1 -reactive-dict@1.1.2 +reactive-dict@1.1.3 reactive-var@1.0.6 reload@1.1.4 retry@1.0.4 risul:moment-timezone@0.4.0 routepolicy@1.0.6 +sanjo:jasmine@0.20.2 +sanjo:karma@3.0.2 +sanjo:long-running-child-process@1.1.3 +sanjo:meteor-files-helpers@1.2.0_1 +sanjo:meteor-version@1.0.0 service-configuration@1.0.5 session@1.1.1 sha@1.0.4 @@ -149,8 +157,8 @@ spacebars@1.0.7 spacebars-compiler@1.0.7 spiderable@1.0.9 srp@1.0.4 -standard-minifiers@1.0.1 -templating@1.1.4 +standard-minifiers@1.0.2 +templating@1.1.5 templating-tools@1.0.0 tracker@1.0.9 twitter@1.1.5 @@ -160,6 +168,14 @@ underscorestring:underscore.string@3.2.2 url@1.0.5 utilities:avatar@0.9.2 utilities:spin@2.3.1 -webapp@1.2.2 +velocity:chokidar@1.2.0_1 +velocity:core@0.10.7 +velocity:helpers@0.4.0 +velocity:html-reporter@0.9.1 +velocity:meteor-internals@1.1.0_7 +velocity:meteor-stubs@1.1.1 +velocity:shim@0.1.0 +velocity:source-map-support@0.3.2_1 +webapp@1.2.3 webapp-hashing@1.0.5 weibo@1.1.4 From e59047e4796d1fb27410b034a4b83ba44835221a Mon Sep 17 00:00:00 2001 From: RyanPPS Date: Thu, 29 Oct 2015 13:10:12 -0700 Subject: [PATCH 11/13] somechanges and submules --- .gitmodules | 6 +++--- .meteor/packages | 1 + .meteor/versions | 27 ++++++++++++++------------- packages/reaction-core | 2 +- packages/reaction-hellworld | 1 - 5 files changed, 19 insertions(+), 18 deletions(-) delete mode 160000 packages/reaction-hellworld diff --git a/.gitmodules b/.gitmodules index af87ae0..2b2a85d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,6 @@ [submodule "packages/reaction-core-theme"] path = packages/reaction-core-theme url = git@github.com:reactioncommerce/reaction-core-theme.git -[submodule "packages/reaction-hellworld"] - path = packages/reaction-hellworld - url = git@github.com:reactioncommerce/reaction-helloworld.git +[submodule "packages/reaction-bulkimport"] + path = packages/reaction-bulkimport + url = git@github.com:reactioncommerce/reaction-bulkimport.git diff --git a/.meteor/packages b/.meteor/packages index b69ff5d..00a7567 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -63,3 +63,4 @@ reactioncommerce:reaction-stripe #meteorhacks:kadira-profiler #meteortoys:allthings reactioncommerce:reaction-helloworld +reactioncommerce:reaction-bulkimport diff --git a/.meteor/versions b/.meteor/versions index 468f20d..568426f 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -7,13 +7,11 @@ accounts-password@1.1.3 accounts-twitter@1.0.6 accounts-weibo@1.0.6 alanning:roles@1.2.14 -aldeed:autoform@5.6.0 +aldeed:autoform@5.7.1 aldeed:collection2@2.5.0 aldeed:simple-schema@1.3.3 aldeed:template-extension@3.4.3 amplify@1.0.0 -anti:i18n@0.4.3 -aslagle:reactive-table@0.8.15 audit-argument-checks@1.0.4 autoupdate@1.2.3 babel-compiler@5.8.24_1 @@ -46,7 +44,7 @@ cfs:power-queue@0.9.11 cfs:reactive-list@0.0.9 cfs:reactive-property@0.0.4 cfs:standard-packages@0.5.9 -cfs:storage-adapter@0.2.2 +cfs:storage-adapter@0.2.3 cfs:tempstore@0.1.5 cfs:ui@0.1.3 cfs:upload-http@0.0.20 @@ -79,14 +77,14 @@ html-tools@1.0.5 htmljs@1.0.5 http@1.1.1 id-map@1.0.4 -iron:controller@1.0.8 -iron:core@1.0.8 -iron:dynamic-template@1.0.8 -iron:layout@1.0.8 -iron:location@1.0.9 -iron:middleware-stack@1.0.10 -iron:router@1.0.10 -iron:url@1.0.9 +iron:controller@1.0.12 +iron:core@1.0.11 +iron:dynamic-template@1.0.12 +iron:layout@1.0.12 +iron:location@1.0.11 +iron:middleware-stack@1.0.11 +iron:router@1.0.12 +iron:url@1.0.11 jparker:crypto-core@0.1.0 jparker:crypto-md5@0.1.1 jparker:gravatar@0.3.1 @@ -129,11 +127,12 @@ raix:ui-dropped-event@0.0.7 random@1.0.4 rate-limit@1.0.0 reactioncommerce:bootstrap-theme@1.7.0 -reactioncommerce:core@0.9.2 +reactioncommerce:core@0.9.3 reactioncommerce:core-theme@1.8.0 reactioncommerce:reaction-accounts@1.2.0 reactioncommerce:reaction-analytics@1.1.0 reactioncommerce:reaction-analytics-libs@1.1.0 +reactioncommerce:reaction-bulkimport@0.4.0 reactioncommerce:reaction-helloworld@0.4.0 reactioncommerce:reaction-paypal@1.2.0 reactioncommerce:reaction-shipping@0.6.0 @@ -155,6 +154,8 @@ srp@1.0.4 standard-minifiers@1.0.1 templating@1.1.4 templating-tools@1.0.0 +tomi:upload-jquery@1.0.7 +tomi:upload-server@1.0.3 tracker@1.0.9 twitter@1.1.5 ui@1.0.8 diff --git a/packages/reaction-core b/packages/reaction-core index 4c8e5bc..f67f0b3 160000 --- a/packages/reaction-core +++ b/packages/reaction-core @@ -1 +1 @@ -Subproject commit 4c8e5bcb5f421e5744381fc696b45ed662efb96c +Subproject commit f67f0b392cb409ea0ba985d6b5634b8c74d894bb diff --git a/packages/reaction-hellworld b/packages/reaction-hellworld deleted file mode 160000 index 8df8367..0000000 --- a/packages/reaction-hellworld +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8df836747e935b2df1a297824cfa3ba90fbb771b From 40d1de45a17da77e24b6bf6c5f9a51387cde97cd Mon Sep 17 00:00:00 2001 From: RyanPPS Date: Thu, 29 Oct 2015 13:54:30 -0700 Subject: [PATCH 12/13] modifications to gitmodules and a package --- .gitmodules | 3 ++- packages/reaction-bulkimport | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 160000 packages/reaction-bulkimport diff --git a/.gitmodules b/.gitmodules index 2b2a85d..fa9878a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,7 @@ [submodule "packages/reaction-core-theme"] path = packages/reaction-core-theme url = git@github.com:reactioncommerce/reaction-core-theme.git + [submodule "packages/reaction-bulkimport"] path = packages/reaction-bulkimport - url = git@github.com:reactioncommerce/reaction-bulkimport.git + url = https://github.com/RyanPPS/reaction-bulkimport.git diff --git a/packages/reaction-bulkimport b/packages/reaction-bulkimport new file mode 160000 index 0000000..aa64722 --- /dev/null +++ b/packages/reaction-bulkimport @@ -0,0 +1 @@ +Subproject commit aa64722d84269f797c5ea87895529795875dfb5b From b8d3bd5933cb5d4ec8e046fea5199ea66bca6f5b Mon Sep 17 00:00:00 2001 From: RyanPPS Date: Thu, 29 Oct 2015 14:00:42 -0700 Subject: [PATCH 13/13] modified versions file --- .meteor/versions | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index 1ccc707..e724798 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -130,30 +130,17 @@ raix:ui-dropped-event@0.0.7 random@1.0.5 rate-limit@1.0.0 reactioncommerce:bootstrap-theme@1.7.0 -<<<<<<< HEAD -reactioncommerce:core@0.9.3 -======= reactioncommerce:core@0.9.4 ->>>>>>> 16ac736e3bbb0c1148ca69957483da8a25232b1b reactioncommerce:core-theme@1.8.0 reactioncommerce:reaction-accounts@1.5.1 reactioncommerce:reaction-analytics@1.1.1 reactioncommerce:reaction-analytics-libs@1.1.0 -<<<<<<< HEAD -reactioncommerce:reaction-bulkimport@0.4.0 reactioncommerce:reaction-helloworld@0.4.0 -reactioncommerce:reaction-paypal@1.2.0 -reactioncommerce:reaction-shipping@0.6.0 -reactioncommerce:reaction-social@0.4.0 -reactioncommerce:reaction-stripe@2.2.0 -reactive-dict@1.1.2 -======= reactioncommerce:reaction-paypal@1.2.2 reactioncommerce:reaction-shipping@0.6.1 reactioncommerce:reaction-social@0.4.1 reactioncommerce:reaction-stripe@3.0.1 reactive-dict@1.1.3 ->>>>>>> 16ac736e3bbb0c1148ca69957483da8a25232b1b reactive-var@1.0.6 reload@1.1.4 retry@1.0.4 @@ -195,3 +182,4 @@ velocity:source-map-support@0.3.2_1 webapp@1.2.3 webapp-hashing@1.0.5 weibo@1.1.4 +reactioncommerce:reaction-bulkimport