Merge to Master #34
Merged
Merge to Master #34
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Show Sidebar shipping in checkout * Set actionView after payment checkout step * Hide sidebar on entry to profile page * Using publish-counts to record count of orders in order tabs * Add alert and checkout message when item quantities have been adjusted * Code cleanup * Add 'Show More' button for pagination (to be refined) * Update errors to include when cart is already full * Removing unnecessary subscription.ready from composer function * Modify orders cursor to use state instead; identify filter from 'show more' button * Actually deny when out of stock * Fix 'Show More' button functionality * Add more descriptive error messages * Using publish-counts to record count of orders in order tabs * Code cleanup * Add 'Show More' button for pagination (to be refined) * Removing unnecessary subscription.ready from composer function * Modify orders cursor to use state instead; identify filter from 'show more' button * Fix 'Show More' button functionality * Fix console error on Quantity * Fix PR arising issue on quantity * Using reactiveDict to store order limits * Using camelcase for naming * Passing filter to PaginatedOrders subscription for query builder in publish * Publishing order counts using Mongo aggregate pipeline * Clean up a few edge cases * Add i18n translations * Remove file changes different from development * Turns out I don't need this publication; it doesn't work well anyway because it doesn't return a Mongo cursor * Remove all references to addressbook.js * Set custom layout to override based on priority field (reactioncommerce#2023) * Set Custom layout to override based on priority field * Update existing priority field to use new default * Migrate existing priority fields * Fix audience schema to be array of Strings * Check before updating during migration * Add down migration and refactor * Add reaction packages with layouts to migrate * Method to aggregate order counts * fix createDefaultAdminUser behavior with users in the system * Resolve cart addition issue (reactioncommerce#2048) * Calling aggregate function in React container * Rewriting aggregate method to use wrapAsync * Returning Toplevel products as per scroll limit for non admin users fixes reactioncommerce#2029 (reactioncommerce#2063) * Refactor calling aggregate function in React container * Removing unnecessary order subscriptions in order template * Removing unnecessary order Counts.publish from Orders publication * [WIP] Broken Formatting for Non-USD currencies (reactioncommerce#2062) * fix nonUSD currencies formatting error * add proper formatting for tax, discount and shipping fields * Set order count to 0 if there are no orders in the database * Remove unnecessary parameter to order/count * Changes to order template: Increasing order limit variables and increment value: using order count to render 'Show More' button * Using publish-counts to display order counts * Removing unnecessary orders/count method * Adding i18n on Show More button * Adding optional check on filter in PaginatedOrders publication * Sending subscription limit as props to React component * Don't subscribe to all media (reactioncommerce#2073) * Don't subscribe to all media - Publish brand assets globally in media publication - Publish product media in the `Products` and `Product` publications - Limit media to only published products * De-duplicate fetch product media functionality Ensure permissions and workflows are checked when fetching the media. * Update logic of if / else inclusion / exclusion by workflow * Fix endless spinner issue * Add requirements to readme Adds link to requirements docs above installation instructions * Move requirements below installation * Remove isHidden check from core startup b/c blocking safari - fixes reactioncommerce#2088 * Request versions (reaction -v) output in issue template (reactioncommerce#2087) * Fetch all Shippo carriers (reactioncommerce#2078) * Init second request on after next url returned * Refactor to fetch carriers recursively from api * Fix transliteration package to 1.5.2 which doesn’t leak ES6 into bundle * Fix issue reactioncommerce#2026 changed price not displayed for prod on grid page (reactioncommerce#2064) * Fix issue reactioncommerce#2016 changed price not displayed for prod on grid page * Add getVariantQuantity function to ProductRevision * Convert text field to select field for countries (reactioncommerce#2082) * [WIP] reactioncommerce#2070 Fix PDP Url Path For Grid Settings (reactioncommerce#2094) * fix pdp url path for grid settings * remove commented code * Remove legacy PDP (reactioncommerce#2097) * Remove revision conditional * Remove templates * Set total quantity as actual sum of quantity * Don't break out order items * set cartItemId to just _id since they are the same now * Fix unrelated error with missing import * Create shipping record * Don't use cartItemId * Group lineItems by _id rather than cartItemId * Use _id rather than cartItemId. Use sum of quantities rather than length * Restore check for empty items array to fix test * Change cartItemId to _id * 2067 Improper Product Title Wrap (reactioncommerce#2108) * fix improper word wrap in product grid * fix improper product title wrap in firefox * Fix Avalara document id (reactioncommerce#2114) * Don't pass in a cartID, pass in orderId for SalesInvoice * Don't try to parse lines unless we know we have it. No lines, no tax. * Use order.items to display line items * Update core.js Changed "admin" to "owner", which is the default user we're really checking for. * Meteor 1.4.4.1 * Release 1.1.1 * If cartItemId exists from legacy orders, then use those * Don't create default admin user when running in app test mode * Fix "Set Custom Value" on Avalara Usage Type (reactioncommerce#2107) * Get correct id value * Prevent autoform from removing old values * Roll back. Autoform still resetting to old values * Prevent autoform from overriding custom val * show input field for custom; pre-fill with existing custom val * Adjust comment * Adjust comment * Update form reset * Refactor subscription * Fixes reactioncommerce#2116 failure to send email (reactioncommerce#2118) * Fix parens that were out of place in wrapAsync of Email.verifyConfig * Revert the wrapAsync function - I didn’t understand how it worked and it wasn’t the core issue * Don’t set secure to true for port 587 http://stackoverflow.com/a/22468122/1179341 pointed me in the right direction * Fix async tests (reactioncommerce#2128) * Take some newer versions of packages from `meteor update` * Fix test with mixed sync and async * When calling a method with a callback, but the expectations in that callback * Docker base v1.3.0 (reactioncommerce#2129) * Fix missing import * Add import, adjust Proptypes * Update read only Quantity in top variant reactioncommerce#1919 (reactioncommerce#2065) * Update quantity if child variants exist * Change method not to add inentory Quantity when undefined * Add default value for inventoryQuantinty * Fixing non-reactivity of updating quantity field * missing word added to Readme * Fix linting error (reactioncommerce#2140) * 1994 Console Dropzone Warnings (reactioncommerce#2138) * upgrade react-dropzone to latest version * upgrade react-dropzone to latest version * Add npm-shrinkwrap.json Pinned react, node mailer, griddle
…ew development with merged crumbnav branch (#12)
updated submodules
updated eePlugins and ReactionPublicCustomFolder (both submodules)
* ecomm-305 in plugins folder * ecomm-305 in plugins folder
submodule updates
updated both plugins for wear it with placeholder component
submodule update
submodule updates
submodule update
created submodule for private/settings/reaction.json
Merge latest
submodule update
updated eePlugins and ReactionPublicCustomFolder
submodule updates
submodule updates
update submodules
submodule update
katiebvogel
approved these changes
May 18, 2017
Pheonix7284
pushed a commit
that referenced
this pull request
Jul 14, 2017
## Features - **Meteor 1.5 (reactioncommerce#2371)** - **Order fulfillment UI updates (reactioncommerce#2400)** - **React Router updated (reactioncommerce#2123)** - **React Navbar (and deprecated Blaze navbar) (reactioncommerce#2306)** - **Re-introduce icon toolbar as shortcutBar (reactioncommerce#2261)** - **React unit testing example (reactioncommerce#2170)** - **[WIP] [Style guide](https://styleguide.reactioncommerce.com)** ## Changes / Fixes - __Update current user's name on Navbar and profile page when address is added. (reactioncommerce#2455)__ - __Fix reactioncommerce#2422 on email invite link leading to blank screen (reactioncommerce#2437)__ - __Fix reactioncommerce#2459 router range error fix (reactioncommerce#2476)__ - __Remove older Blaze based launchdock plugin (reactioncommerce#2467)__ - __Remove random regex checks on names. Fixes reactioncommerce#2461 (reactioncommerce#2471)__ - __Update media gallery new / deleted image indicators (reactioncommerce#2469)__ - __Fix reactioncommerce#2356 on tag menu-sidebar glitch (reactioncommerce#2472)__ - __Fix reactioncommerce#2452 on UI icon toolbar (reactioncommerce#2460)__ - __set css property overflow on horizontal to hidden (reactioncommerce#2458)__ - __Navbar hover issue (reactioncommerce#2451)__ - __update memory usage in CircleCI build (reactioncommerce#2462)__ - __refactor default admin user creation (reactioncommerce#2453)__ - __Bunyan and Loggly updates (reactioncommerce#2425)__ - __Updated chai package__ - __add missing "orders not found" text (reactioncommerce#2424)__ - __Add closeOnClick option to DropDownMenu component (reactioncommerce#2418)__ - **Fixed console error when dragging product images (reactioncommerce#2443)** - **Remove unmaintained Browserstack acceptance tests (reactioncommerce#2430)** - **Add css style to differentiate read from unread notifications (reactioncommerce#2442)** - **Added module aliases @reactioncommerce/reaction-ui (reactioncommerce#2436)** - **Switch to Reaction’s new fork of Nodemailer (reactioncommerce#2427)** - **Admin should be able to invite a user with the same name (reactioncommerce#2386)** - **Updated yarn.lock and removed npm-shrinkwrap.json** - **use route permissions in register.js files (reactioncommerce#2388)** - **Updated, refreshed order/fulfillment UI (reactioncommerce#2400)** - **Change line width to match GH PR review width (reactioncommerce#2407)** - **Fix Improper Cart Merge (reactioncommerce#2387)** - **Implement missing router functions (reactioncommerce#2393)** - **Correct the way we record tax overrides** - **CollectionFS cfs:tempstore and cfs:worker to Fix concurrency issues with GridFS uploads (reactioncommerce#2096)** - **Fix typo in inventory test description (reactioncommerce#2364)** - **Added Nigerian Naira to currency list in (reactioncommerce#2366)** - **Fix git tagging on CircleCI 2.0 (reactioncommerce#2362)** - **Adding the license description with link on README (reactioncommerce#2365)** - **Better handling for unique routes for React Router (reactioncommerce#2327)** - **Don't throwback a step if tax fails** - **Updated UI colors for styleguide (reactioncommerce#2339)** - **Add loading component to Fix error (reactioncommerce#2340)** - **Allow a MAIL_URL string without auth (reactioncommerce#2330)** - **Defer Fixture load until the default shop is loaded (reactioncommerce#2329)** - **Fix conditional in Circle deploy script (reactioncommerce#2338)** - **Fix refunds not showing (reactioncommerce#2317)** - **Add Verification Url to Welcome Email (reactioncommerce#2216)** - **CircleCI 2.0 and docker base update (reactioncommerce#2334)** - **i18n translation updates (reactioncommerce#2302 reactioncommerce#2420)** - **Change customer notification message when order is processed. (reactioncommerce#2290)** - **Allow loader to show when one is passed in and defined BUGFIX (reactioncommerce#2303)** - **Add the Vietnamese Dong as a supported currency (reactioncommerce#2248)** - **Updated shipping / payment error messages in checkout (reactioncommerce#2271)** - **Fix reactioncommerce#2203 Long Strings Handling in Product Option Title (reactioncommerce#2266)** - **Simplify core layout component (reactioncommerce#2257)** - **Fix multiple refunds for stripe (reactioncommerce#2260)**
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.