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 18 #1516

Merged
merged 143 commits into from
Dec 21, 2016
Merged

Release 18 #1516

merged 143 commits into from
Dec 21, 2016

Commits on Oct 21, 2016

  1. Register template (#1362)

    * added email templates package
    
    Added ability to register html and react templates with new helper
    Reaction.registerTemplate.
    
    * Schema updates and render render functions
    
    Added handlebars render functions, as well as the ability to register a
    custom template renderer.
    Added caching for handlebars templates.
    Updated templates schema with more properties.
    
    * Updated tests and template registration functionality
    
    * add handlebars
    mikemurray authored and Aaron Judd committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    8e54eeb View commit details
    Browse the repository at this point in the history
  2. Quick fixes for template registration (#1518)

    Fixed import of "Import" module.
    Fixed type in jsDoc comments for "Import.template" function.
    mikemurray authored and Aaron Judd committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    e48f466 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2016

  1. Remove unused imports

    brent-hoover committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    665432d View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2016

  1. Add templates to database (#1522)

    * Register all email templates
    
    * Fetch email templates from database
    
    * Add helper to get email template file without any extra dependencies
    
    * Update method for fetching email template file
    
    * Fix template paths
    
    * Re-added missing comment
    
    * Fixed path to core order "new" email template
    mikemurray authored and Aaron Judd committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    3789059 View commit details
    Browse the repository at this point in the history
  2. Admin Invite & Password reset emails (#1523)

    * added some comments to break up html table
    
    * reorganized data for email template
    
    removed all [0]. type variables from new.html email template, so all
    variables are set in orders.js for easy manipulation
    
    * welcome to the shop email template
    
    * extract social from template, add on/off switch
    
    * invite shop member email
    
    * shopName variable updates
    
    * update reaction address
    
    This was driving me crazy seeing the wrong address in all these emails
    being tested.
    
    * add Collections imports for Accounts, Cart, Shopts
    
    * password reset emails
    
    * update subject of order confirmation email
    
    * lint fix
    
    * renamed file for email template
    
    * removed test text
    kieckhafer authored and Aaron Judd committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    1cb8eb8 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2016

  1. Configuration menu
    Copy the full SHA
    7c8c97a View commit details
    Browse the repository at this point in the history
  2. update const to conform to new file name (#1528)

    Will take care of `WARN Reaction: Template not found:
    accounts/reset_password. Falling back to coreDefault.html` error
    kieckhafer authored and Aaron Judd committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    9e7fdca View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2016

  1. Merge branch 'development' into release-0.18.0

    Aaron Judd authored Oct 26, 2016
    Configuration menu
    Copy the full SHA
    573b8a3 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2016

  1. Merge branch 'development' into release-0.18.0

    aaronjudd committed Nov 2, 2016
    Configuration menu
    Copy the full SHA
    0fb4934 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2016

  1. Merge branch 'development' into release-0.18.0

    Aaron Judd authored Nov 7, 2016
    Configuration menu
    Copy the full SHA
    74781e7 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2016

  1. Configuration menu
    Copy the full SHA
    c575fb5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a2460a5 View commit details
    Browse the repository at this point in the history
  3. Make naming consistent

    brent-hoover committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    9c8a0af View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ceb5395 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b37401f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ac2e313 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c9a56b2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    2a40c57 View commit details
    Browse the repository at this point in the history
  9. Logging

    brent-hoover committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    1962101 View commit details
    Browse the repository at this point in the history
  10. No hook, no conditional

    brent-hoover committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    164a024 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    13fe738 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    41d1aff View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    a504444 View commit details
    Browse the repository at this point in the history
  14. Remove logging

    brent-hoover committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    0473ffd View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    d8078af View commit details
    Browse the repository at this point in the history
  16. Discounts (#1556)

    * discount skeleton
    
    - remove from core
    - add core/discounts
    - add discounts-rates
    - add discount-codes
    - new discount schemas [WIP]
    
    * local module import of translations
    
    - adds `loadTranslations` and `loadTranslation` methods
    - removes necessity to add translations to core
    - `import { loadTranslations } from "/server/startup/i18n”;`
    - multiple file import illustrated in reaction-taxes
    - single import illustrated in reaction-discounts
    - introduces mergeDeep helper in i18n/startup and updates to
    translation resource structure to accommodate additional
    namespaces for package (uses package name).
    
    * updated i18n namespace and handling
    
    - add i18n handling for griddle column headers
    - add local i18n imports to discounts
    - updated i18n taxSettings namespace (into packages + admin)
    
    * change info logging to debug
    
    * schemas, forms, ui, i18n for discount modules
    
    * updated Discount schemas
    
    - implement client collections for DiscountCodes, DiscountRates
    - implement multi-schema on server Discounts collection
    
    * updated discounts pub
    
    - split security out
    
    * Meteor 1.4.2.1
    
    updated to Meteor 1.4.2.1.
    
    *  group payments packages
    
    - resolves #1408
    - consolidates all payment packages into a single admin group
    - rename include payment package folders `payment-`
    - add initial local i18n, moved from en.json (TODO, other lang).
    - move “default method” setting from shop to new `core/payments`
    package.
    - move checkout/payment templates from core to `core/payments` package.
    - expose icon in public registry
    Aaron Judd authored and kieckhafer committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    8e5eb79 View commit details
    Browse the repository at this point in the history
  17. PDP Package Layout - ReactionLayout (#1536)

    * Build product detail page from JS object
    
    * Allow for nested blocks, custom styling.
    
    Removed old code.
    Added default columns of 12 if block columns not specified.
    
    * Fix responsive image issues in media gallery
    
    * Fix pdp add to cart button styles
    
    * ReactionLayout for react
    
    Moved layout generator to "layout" core module.
    Added permission check for top level blocks.
    
    * Permissions for components in React ReactionLayout renderer
    
    * Pass ProductDetail props to component in layout tree.
    
    * Style updates for product detail page configuration.
    
    * Remove logger, as it doesn't provide useful data in its current form
    
    * Adds ability to add react template layout to database to render full page views
    
    * Adds ability to use media queries when defining blocks
    
    * add missing dependency for radium
    
    * fix broken template tests
    mikemurray authored and kieckhafer committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    68dca93 View commit details
    Browse the repository at this point in the history
  18. More email templates (#1557)

    * added some comments to break up html table
    
    * reorganized data for email template
    
    removed all [0]. type variables from new.html email template, so all
    variables are set in orders.js for easy manipulation
    
    * welcome to the shop email template
    
    * extract social from template, add on/off switch
    
    * invite shop member email
    
    * shopName variable updates
    
    * update reaction address
    
    This was driving me crazy seeing the wrong address in all these emails
    being tested.
    
    * add Collections imports for Accounts, Cart, Shopts
    
    * password reset emails
    
    * update subject of order confirmation email
    
    * lint fix
    
    * renamed file for email template
    
    * removed test text
    
    * path file organization
    
    * mail -> SMTP for clarification
    
    * Merge branch 'release-0.18.0' into email-template-expansion-v2
    
    # Conflicts:
    #	imports/plugins/included/email-templates/lib/paths.js
    
    * i18n for email template admin
    
    * publication for Templates
    
    * conflict fix
    
    * add email subject into saved DB data
    
    * add server methods for deleting email templates
    
    * Add a duplicate, editable template to the template collection (#1548)
    
    Mark one of those templates and an original, which can be used to
    revert editable templates.
    
    * server methods for updating email templates
    
    * added check for original template
    
    * new translations
    
    * Merge branch 'release-0.18.0' into email-template-expansion-v2
    
    * core workflow emails - processing & completed
    
    * test - new workflow email exports
    
    * Update email schema
    
    * shipping email
    
    * conflict fixes
    
    * removed comments
    
    * removed comments
    
    * import new email schema
    
    * template updates
    
    * removed commented code
    
    * organize templates
    
    * added todo to schema
    
    * updated comments
    
    * cleanup methods file
    
    * updated error messaging
    
    * schema update
    
    * update comments
    
    * i18n updates
    
    * removed testing alerts
    
    * i18n updates
    
    * file organization
    kieckhafer authored Nov 10, 2016
    Configuration menu
    Copy the full SHA
    bca6752 View commit details
    Browse the repository at this point in the history
  19. Revision control for images (#1555)

    * Add media hook. Rename file to "hooks'"
    
    * Only return published images for non-admin users
    
    * Only set product images as unpublished
    
    * Capture revision record and show Publish button when image changes are made
    
    * Adding images deferred until published
    
    * Removing images deferred until published
    
    * Capturing and deferring other changes to metadata (priority really)
    
    * Combine revisions when making multiple changes before publishing
    
    * Properly handle non-product revisions in applyProductRevision so that product doesn't get wiped.
    
    * Find the product correctly based on revision type
    
    * Fix regression where images weren't being published because revision data was wrong
    
    * Setting priceRange should be in an `else` statement
    
    * If you add an image and then delete it before publishing it, just remove it.
    
    * Update revisions with media
    
    * Show visual indicator on image if there are pending revisions
    
    * Discard drafts of image revisions
    
    * Sometimes rendering the "edited" marker
    
    * Reset revisions so that removals take effect
    
    * Set priority to revision priority
    
    * Fix issue where changing order wouldn't stick
    
    * Remove logging
    
    * Change lost in merge
    
    * Another change from merge
    brent-hoover authored and kieckhafer committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    86f52d2 View commit details
    Browse the repository at this point in the history
  20. Green flash on fields in PDP page after change success (#1558)

    * Green flash on fields in PDP page after change success
    
    * Updated tags and metafields with a flash of green on success submit
    mikemurray authored and kieckhafer committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    1663824 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    c1eea40 View commit details
    Browse the repository at this point in the history
  22. Fixed broken PDP template

    Removed duplicate Templates publication
    mikemurray committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    eabddb7 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2016

  1. Patched 0.18 tests (#1566)

    * updated tests for discount methods
    
    * updated meteor versions
    
    - includes update johanbrook:publication-collector
    Aaron Judd authored Nov 11, 2016
    Configuration menu
    Copy the full SHA
    a1dbed3 View commit details
    Browse the repository at this point in the history
  2. move discount rates to catalog/codes to payments

    aaronjudd committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    bc83c9e View commit details
    Browse the repository at this point in the history
  3. restore default method data

    aaronjudd committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    b7db046 View commit details
    Browse the repository at this point in the history
  4. Expandable cards

    PDP admin panel now has expandable cards with selecting fields to edit
    from PDP page.
    mikemurray committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    1c344f8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2dca13a View commit details
    Browse the repository at this point in the history
  6. Add missing NPM dependency

    mikemurray committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    1bc4f9d View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2016

  1. Configuration menu
    Copy the full SHA
    02cfdd2 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2016

  1. Meteor 1.4.2.1 (#1575)

    aaronjudd committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    b9e0aeb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6aa638e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b4c537c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    be6cf6e View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2016

  1. Loading component added for reactionLayout (#1570)

    Aaron Judd authored Nov 14, 2016
    Configuration menu
    Copy the full SHA
    2f08e7a View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2016

  1. Configuration menu
    Copy the full SHA
    4026db8 View commit details
    Browse the repository at this point in the history
  2. renamed templates function

    kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    92f857e View commit details
    Browse the repository at this point in the history
  3. fixed listing errors

    kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    a4cd2c8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a32f33c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b9f044f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5c2703e View commit details
    Browse the repository at this point in the history
  7. Change templates importing to use Assets collection (#1583)

    * change templates importing to use Assets collection
    
    * renamed templates function
    
    * fixed listing errors
    
    * add flush & changed onCoreInit -> afterCoreInit
    
    * removed isOriginalTemplate, which is no longer used
    
    * InitTemplates() -> initTemplates()
    brent-hoover authored Nov 15, 2016
    Configuration menu
    Copy the full SHA
    1568d06 View commit details
    Browse the repository at this point in the history
  8. move import settings (#1573)

    - moved “Import” from settings/settings.html to import/import.html
    - is currently not used and won’t be visible, but can be basis for
    import settings.
    
    resolves #1050
    Aaron Judd authored and kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    bfabfa6 View commit details
    Browse the repository at this point in the history
  9. Update Order Progress Workflow (#1580)

    * update workflow when process is not done the traditional way
    
    * update import order
    
    * fixed linting issues
    
    * removed old / unused nom packages
    kieckhafer authored Nov 15, 2016
    Configuration menu
    Copy the full SHA
    158cc8a View commit details
    Browse the repository at this point in the history
  10. PDP 500 (#1572)

    * Added add button for variant list.
    
    Hide available options divider, if there are no available options.
    
    * UX tweaks for varying numbers of variants in list
    
    - Hide options label when there is only one top level variant
    - add tooltip to add button
    
    * Hide add button for non-admin users
    
    * More UI tweaks for products without variants
    
    Hide add to cart button if there are no variant options available.
    Hide options separator if there are no variant options and use is not
    an admin.
    
    * Added i18n
    mikemurray authored and kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    e6c3d34 View commit details
    Browse the repository at this point in the history
  11. i18n updates for the Templates package (#1571)

    * fix for templates not loading on initial reaction startup
    
    * changed the order
    
    * move i18n to new modular style
    
    * formatting
    
    * Update core.js
    
    * Update core.js
    
    * Update index.js
    
    * Update email.html
    
    * removed "moo"
    kieckhafer authored Nov 15, 2016
    Configuration menu
    Copy the full SHA
    66d0aff View commit details
    Browse the repository at this point in the history
  12. Fix remove icon not displaying / revision change (#1564)

    * Add media hook. Rename file to "hooks'"
    
    * Only return published images for non-admin users
    
    * Only set product images as unpublished
    
    * Capture revision record and show Publish button when image changes are made
    
    * Adding images deferred until published
    
    * Removing images deferred until published
    
    * Capturing and deferring other changes to metadata (priority really)
    
    * Combine revisions when making multiple changes before publishing
    
    * Properly handle non-product revisions in applyProductRevision so that product doesn't get wiped.
    
    * Find the product correctly based on revision type
    
    * Fix regression where images weren't being published because revision data was wrong
    
    * Setting priceRange should be in an `else` statement
    
    * If you add an image and then delete it before publishing it, just remove it.
    
    * Update revisions with media
    
    * Show visual indicator on image if there are pending revisions
    
    * Discard drafts of image revisions
    
    * Sometimes rendering the "edited" marker
    
    * Reset revisions so that removals take effect
    
    * Set priority to revision priority
    
    * Fix issue where changing order wouldn't stick
    
    * Remove logging
    
    * Change lost in merge
    
    * Another change from merge
    
    * Don't show remove icon once an item has been removed.
    
    * Protect against a non-existent product
    brent-hoover authored and kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    f19f739 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #1561 from reactioncommerce/brent-fix-issue-1399

    Allow for disabling/overriding of search modal from a plugin
    Aaron Judd authored Nov 15, 2016
    Configuration menu
    Copy the full SHA
    9ace63d View commit details
    Browse the repository at this point in the history
  14. updated subject to use SSR

    kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    b5b5077 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    48428ed View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    0ab2a60 View commit details
    Browse the repository at this point in the history
  17. added new field to update

    kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    1766913 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    e7360a1 View commit details
    Browse the repository at this point in the history
  19. removed unused fields

    kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    66d957f View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    2c5c853 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    df0e9ee View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    17585fb View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    a200f2a View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    7d61088 View commit details
    Browse the repository at this point in the history
  25. updated npm dependencies

     country-data          ^0.0.30  →     ^0.0.31
     griddle-react          ^0.6.1  →      ^0.7.0
     i18next                ^3.4.3  →      ^4.0.0
     sortablejs             ^1.4.2  →  ^1.5.0-rc1
     sweetalert2            ^5.3.8  →      ^6.1.0
     wdio-mocha-framework   ^0.4.3  →      ^0.5.4
    aaronjudd committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    8303570 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    94c3c99 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    59ad510 View commit details
    Browse the repository at this point in the history
  28. remove old console.logs

    kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    ea5d6ba View commit details
    Browse the repository at this point in the history
  29. fixed type

    kieckhafer committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    010dfa4 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    0eb19c2 View commit details
    Browse the repository at this point in the history
  31. Fixed issue with closing cards on edit

    cleanup of various eslint issues.
    mikemurray committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    dccecb9 View commit details
    Browse the repository at this point in the history
  32. fixed prop validation

    mikemurray committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    ca440d2 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    3b48518 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    ac05694 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. Upgrade to react-komposer v2

    Added composeWithTracker wrapper around v2 features in lib.
    Updated all react-komposer imports to use version from lib.
    mikemurray committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    7edfff2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1587 from reactioncommerce/react-komposer-v2

    Upgrade to react-komposer v2
    Aaron Judd authored Nov 16, 2016
    Configuration menu
    Copy the full SHA
    2139098 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2016

  1. Merge branch 'release-0.18.0' into pdp-accordian

    # Conflicts:
    #
    imports/plugins/included/product-admin/client/containers/productAdminCon
    tainer.js
    mikemurray committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    7ddd725 View commit details
    Browse the repository at this point in the history
  2. Fix alerts

    Was trying to call Alerts on the server, instead of the client. Fixed.
    kieckhafer committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    067a495 View commit details
    Browse the repository at this point in the history
  3. New Email: Refunds

    kieckhafer committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    7d1b0ae View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ce4f4a7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    897739c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    cd44c7c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    181831f View commit details
    Browse the repository at this point in the history
  8. linting fixes

    kieckhafer committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    ef0b7da View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a6947bc View commit details
    Browse the repository at this point in the history
  10. removed errant console

    kieckhafer committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    cd55c28 View commit details
    Browse the repository at this point in the history
  11. subject update

    kieckhafer committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    097a8aa View commit details
    Browse the repository at this point in the history
  12. camelCasing some things

    kieckhafer committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    4b4cd75 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2016

  1. Configuration menu
    Copy the full SHA
    c046824 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1569 from reactioncommerce/pdp-accordian

    Expandable cards
    Aaron Judd authored Nov 18, 2016
    Configuration menu
    Copy the full SHA
    715cf0b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bd30fd3 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'development' into release-0.18.0

    Aaron Judd authored Nov 18, 2016
    Configuration menu
    Copy the full SHA
    35c3082 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1a74744 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7375f35 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2016

  1. [WIP] Updates to package registry

    aaronjudd committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    3a780d5 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/release-0.18.0' into package-set…

    …tings
    aaronjudd committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    bfbc451 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2016

  1. Merge pull request #1588 from reactioncommerce/ek-431-sendNotification

    Send order notification when user adds email
    brent-hoover authored Nov 21, 2016
    Configuration menu
    Copy the full SHA
    b35ffad View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2016

  1. updated reaction Apps

    Updated package registry handling, updates for payments.
    aaronjudd committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    7ab967c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1585 from reactioncommerce/ek-more-emails

    more email templates
    Aaron Judd authored Nov 22, 2016
    Configuration menu
    Copy the full SHA
    e2d11a0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b90e0f4 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/release-0.18.0' into package-set…

    …tings
    aaronjudd committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    ac48108 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2016

  1. Add localhost WS browser-policy

    Resolve `websocket because it does not appear in the connect-src
    directive of the Content Security Policy` error in safari when using
    —production build.
    aaronjudd committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    2e25174 View commit details
    Browse the repository at this point in the history
  2. Payment package updates, removes name

    - removes name from some payment method registry entries
    - use name if separate settings and permissions are needed
    - applies permission checks in package publication for filtering
    enabled views
    - uses package name as default settings key,  used when no name
    aaronjudd committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    81893a7 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2016

  1. Move mergeDeep into /lib/api/helpers

    aaronjudd committed Nov 24, 2016
    Configuration menu
    Copy the full SHA
    a4704d6 View commit details
    Browse the repository at this point in the history
  2. Update settings handling

    - Cleanup handling in taxes, discounts, catalog package handling
    - Fix error where registry update was overwriting existing settings
    - use mergeDeep for registry updates
    aaronjudd committed Nov 24, 2016
    Configuration menu
    Copy the full SHA
    b9865ed View commit details
    Browse the repository at this point in the history
  3. Cleanup panels in payments, taxes

    - remove excessive panels
    - add i18n
    - generic alerts
    - convert panel-title to alert info
    - show alert message only pre-setup
    aaronjudd committed Nov 24, 2016
    Configuration menu
    Copy the full SHA
    2869e66 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2016

  1. Updated package

    momentjs:moment  upgraded from 2.16.0 to 2.17.0
    aaronjudd committed Nov 25, 2016
    Configuration menu
    Copy the full SHA
    3d56c34 View commit details
    Browse the repository at this point in the history
  2. PayPal as split payment methods

    - Process multiple matching entries in registry
    - adds i18n for PayPal client views
    - splits PayPal into two payment methods for settings/checkout
    - todo add migration for express_enabled to express.enabled
    - todo add migration for payflow_enabled to payflow.enabled
    - add browser policy akamai.mathtag.com
    - apply standard button style + i18n to all payment settings
    aaronjudd committed Nov 25, 2016
    Configuration menu
    Copy the full SHA
    5825750 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2016

  1. Add Month Translations to monthOptions helper

    aaronjudd committed Nov 27, 2016
    Configuration menu
    Copy the full SHA
    1588b3e View commit details
    Browse the repository at this point in the history
  2. updated payments styling, missing i18n

    - single card payment layout
    - removes default payment method and collapse handling in checkout
    - commented in dashboard payment settings. TBD.
    - resolves #1408
    aaronjudd committed Nov 27, 2016
    Configuration menu
    Copy the full SHA
    73561ed View commit details
    Browse the repository at this point in the history
  3. object-curly-spacing lint rules applied

    aaronjudd committed Nov 27, 2016
    Configuration menu
    Copy the full SHA
    86d2199 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2016

  1. Avoid localLocale.defineLocale warning

    aaronjudd committed Nov 28, 2016
    Configuration menu
    Copy the full SHA
    46ec4e6 View commit details
    Browse the repository at this point in the history
  2. Clarify Auth.net credentials messaging

    aaronjudd committed Nov 28, 2016
    Configuration menu
    Copy the full SHA
    66a8f00 View commit details
    Browse the repository at this point in the history
  3. Only display enabled payment methods to admin in checkout

    - could have just used if in template, or alternate display
    - but this is clean and simple for now.
    aaronjudd committed Nov 28, 2016
    Configuration menu
    Copy the full SHA
    100bafe View commit details
    Browse the repository at this point in the history
  4. Updated import/requires for moment

    Fix error loading moment for template helpers.
    aaronjudd committed Nov 28, 2016
    Configuration menu
    Copy the full SHA
    ea74c21 View commit details
    Browse the repository at this point in the history
  5. Updated translation

    aaronjudd committed Nov 28, 2016
    Configuration menu
    Copy the full SHA
    41aa37b View commit details
    Browse the repository at this point in the history
  6. Update styling for payment settings

    - remove Authnet/dashboard - unused legacy settings?
    aaronjudd committed Nov 28, 2016
    Configuration menu
    Copy the full SHA
    35cf759 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1592 from reactioncommerce/package-settings

    Updated Apps, payment packages
    Aaron Judd authored Nov 28, 2016
    Configuration menu
    Copy the full SHA
    a1bae0b View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2016

  1. Templates fixes (#1600)

    * Remove unused settings icon
    
    * Fix "required" name field
    
    * Update sidebar Reactively when changes are made
    
    * Removed references to "email"
    
    Templates are not just for emails, so I removed references to “Email”
    in all the i18n translations
    
    * Removed "email" as Templates are more than email
    
    * Remove unused functions
    
    * Updated i18n
    
    * Renamed variable away from "template"
    kieckhafer authored and brent-hoover committed Dec 6, 2016
    Configuration menu
    Copy the full SHA
    c957d67 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2016

  1. Configuration menu
    Copy the full SHA
    7692a0f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b1bb1d5 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2016

  1. Configuration menu
    Copy the full SHA
    65fb85d View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2016

  1. Fix bug that causes duplicated variants to be missing images. (#1611)

    * Fix bug that causes duplicated variants to be missing images.
    
    Added a copyFile helper that will bypass revision control to copy a
    file.
    
    * Add missing export
    mikemurray authored and brent-hoover committed Dec 12, 2016
    Configuration menu
    Copy the full SHA
    4e4a87c View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2016

  1. Don't blank out titles (#1617)

    brent-hoover authored and mikemurray committed Dec 13, 2016
    Configuration menu
    Copy the full SHA
    9395c97 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    348fa57 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2016

  1. Fix for page title not updating when selecting product. (#1623)

    This fix also ensures all metadata related to a product is updated when
    the product is selected.
    mikemurray authored and brent-hoover committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    c44946c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ff17146 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2016

  1. Configuration menu
    Copy the full SHA
    6d81917 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2016

  1. added audience permissions to registry schema, and Reaction.Apps now …

    …checks audience perms against user roles and registry item audience if any
    lcampanis committed Dec 16, 2016
    Configuration menu
    Copy the full SHA
    05355bd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    68d0ba5 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2016

  1. Configuration menu
    Copy the full SHA
    0bcebfb View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2016

  1. Prerender.io Integration - Feature #1249 (#1643)

    Spencer Norman authored and brent-hoover committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    0816308 View commit details
    Browse the repository at this point in the history
  2. Move Template editing to Sidebar (#1612)

    * Move Template editing to Sidebar
    
    * Removed logs
    
    * Linting fixes
    
    * i18n updates
    
    * renamed filed to remove email designation
    
    * package name update
    
    * add info box around React message
    kieckhafer authored and brent-hoover committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    8217a5d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1639 from reactioncommerce/1622-audience-registry…

    …-perms
    
    1622 Add audience permissions to registry items
    Aaron Judd authored Dec 20, 2016
    Configuration menu
    Copy the full SHA
    29053d7 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1629 from reactioncommerce/safari-browser-policy

    Fix Safari websocket connection browser policy
    Aaron Judd authored Dec 20, 2016
    Configuration menu
    Copy the full SHA
    b8d0df1 View commit details
    Browse the repository at this point in the history
  5. Fix price updates (#1633)

    * add applyProductRevision to Products.findOne
    
    * fix price range for revisions
    
    * fix isVisible price updates
    
    * fix for price object not initially being created
    
    * add product.range updating to non-revision enabled app
    kieckhafer authored and brent-hoover committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    9f52b67 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2016

  1. Checkout discount code input (#1620)

    * Fix typo in CircularProgress
    
    indetermate -> indeterminate
    
    * Enabled false for Express on initial startup
    
    * Updated payments method
    
    - Replaces `payments/paymentMethod` with `payments/cart/apply`
    - add discounts/codes/remove
    - add discounts/codes/apply
    
    * Initial DiscountList DiscountForm components
    
    * functional discount code input
    
    * basic discount calculations in cart
    
    * Updated discount input loader
    
    * Only display shipping, discounts, taxes gt 0
    
    * Order discount not to exceed 0 (no neg values)
    
    * Update plugin structure
    
    * fix typo in taxes input
    
    numericInputProps "taxes"
    
    * apply discounts in order process
    
    - DiscountList and DiscountForm components can be used for Orders or
    Cart collection
    - working CODES as discounts through order process
    - a number of outstanding TODO’s remain for discount conditional logic
    and limit handling
    - Order process is easily broken, and will need modification to payment
    handling to check for authorization below above current authorization
    if discount is removed.
    
    * Fix event handling in FF
    
    * disable delete discount in admin ui
    
    * Format discount
    
    * Implement credit/debit payment method selectors
    
    - Replace order.billing[0] with credit selector
    - update and enforce that paymentMethod.method should be “credit”,
    “debit”.
    - refactor Order updates to allow for credit to be in any position
    
    * Minor lint updates
    
    * Updated billing constants
    
    * Updated billing constants
    
    * Updated selector constants
    
    * Set min-height on cart-items
    
    - prevent some of the ugly transitions. Needs loader.
    
    * add fallback paymentMethod for email
    
    - add processor in case there isn’t a storedCard
    
    * Add calculation method to schema/forms
    
    * info -> debug
    
    - for `not creating default admin user”`
    - for `Reaction.init() has run`
    
    * implement hooks for per processor calculation methods
    
    * Info -> debug logging
    
    * discount, credit, sale, shipping calculations
    
    * Discount code form cleanup
    
    - add a few additional checks on fresh carts
    
    * import indexOf
    
    * Codes disabled by default
    
    * autoEnable discount-codes
    
    - is actually required right now, as the logic in payment doesn’t
    extend to enabling the package.
    
    * Patch link for non-configured payments
    
    * Add default calculation method
    
    - ensure that rates/discount exists
    - cleanup jsdocs
    
    * Updated orders discounts/credit/shipping summary
    Aaron Judd authored and brent-hoover committed Dec 21, 2016
    Configuration menu
    Copy the full SHA
    5146b27 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fe706f0 View commit details
    Browse the repository at this point in the history
  3. Attempt to make tests more consistent (#1565)

    * Fixes to inventory tests
    
    * Create new versions of cart fixtures that create less "random" versions so that db impact is minimized.
    
    * Eliminate unneeded originals entries
    
    * Put expectations in callbacks rather than putting in sleeps
    
    * Make this global wait more visible
    
    * The quantity on remove quantity should always be 1 now that we are using the custom fixture.
    
    * Allow direct importing of inventory function
    
    * creating createCart function
    
    * test for createCart function
    
    * Directly call registerInventory to avoid permissions check that doesn't apply
    
    * Add singleVariant version of addProduct
    
    * Trying to get these tests to run reliably by trying to normalize the inventory beforehand
    
    * createCart function
    
    * test for createCart function
    
    * Change currency symbol for PHP (wut?)
    
    * Db-normalized inventory tests
    
    * Just blindly increase this timeout
    
    * Add comment explaining why we need this long timeout
    
    * Remove Logger
    
    * Extend timeout on cart test
    
    * Add sleep for createVariant tests
    
    * Quiet inventory register logging that I should not have put there anyway
    
    * Don't operate on product if it's not found
    
    * Update to fixed publication-collector
    
    * Increase timeout on discount test
    
    * Update publication-collector
    
    * Don't call Alert in a server method
    
    * Lint cleanup
    brent-hoover authored and Aaron Judd committed Dec 21, 2016
    Configuration menu
    Copy the full SHA
    cfa89b0 View commit details
    Browse the repository at this point in the history