Commits on Jul 21, 2016
  1. @jamesallsup

    Merge pull request #4691 from CoverUp/patch-6

    Update register.tpl
    jamesallsup committed on GitHub Jul 21, 2016
  2. @CoverUp

    Update register.tpl

    fixed issue #4683
    that has been undo during rollback from twig
    CoverUp committed on GitHub Jul 21, 2016
Commits on Jul 6, 2016
  1. @danielkerr

    Merge pull request #4619 from florinsith/patch-2

    Customer searches text in menu
    danielkerr committed on GitHub Jul 6, 2016
Commits on Jul 5, 2016
  1. @florinsith

    Customer searches text in menu

    florinsith committed on GitHub Jul 5, 2016
  2. @jamesallsup

    Beta release v2.3.0.0_b1

    jamesallsup committed Jul 5, 2016
  3. @danielkerr
  4. @danielkerr

    more compatibility fixes

    danielkerr committed Jul 5, 2016
  5. @danielkerr

    permission update

    danielkerr committed Jul 5, 2016
  6. @danielkerr

    more extension changes

    danielkerr committed Jul 5, 2016
  7. @danielkerr

    more compatibility fixes

    danielkerr committed Jul 5, 2016
  8. @danielkerr

    fix for permission issue

    danielkerr committed Jul 5, 2016
Commits on Jul 4, 2016
  1. @chris-wm
  2. @danielkerr

    removed elis bad coding

    danielkerr committed Jul 4, 2016
  3. @danielkerr

    #4606

    danielkerr committed Jul 4, 2016
  4. @jamesallsup

    Merge pull request #4613 from openbaypro/master

    OpenBay stable.
    jamesallsup committed on GitHub Jul 4, 2016
  5. @jamesallsup
  6. @danielkerr

    fix for session write issue

    danielkerr committed Jul 4, 2016
  7. @danielkerr

    Merge pull request #4607 from gnCupo/grammar-1

    Replaced whitespace with dash between cardinal direction & geographical names in Dutch provinces
    danielkerr committed on GitHub Jul 4, 2016
  8. @jamesallsup
Commits on Jul 3, 2016
  1. @gnCupo

    Replaced whitespace with dash between cardinal direction & geographic…

    …al names in Dutch provinces
    gnCupo committed Jul 3, 2016
  2. @jamesallsup

    Updated OpenBay events (more), added minor debug logging entries for …

    …events.
    
    Added missing etsy logging setting in controller for settings.
    Added automatic etsy API setting sync after credentials/connection is validated - no longer requires a manual step after setup.
    Hide sync and pull order buttons in etsy settings if the credentials are not valid.
    Removed JS function that was not being used (looks like it was copied from ebay setting page).
    Added missing amazon eu/us error language strings (previously hard coded English response).
    Code tidy and variable name changes for Amazon eu/us on stock update methods - easier to follow.
    jamesallsup committed Jul 3, 2016
Commits on Jul 2, 2016
  1. @jamesallsup

    Merge branch 'master' of github.com:opencart/opencart

    # Conflicts:
    #	upload/admin/view/template/sale/order_info.tpl
    jamesallsup committed Jul 2, 2016
Commits on Jul 1, 2016
  1. @danielkerr

    Merge pull request #4600 from opencart/dev

    Merge pull request #4599 from opencart/master
    danielkerr committed on GitHub Jul 1, 2016
  2. @danielkerr

    test

    danielkerr committed Jul 1, 2016
  3. @danielkerr
  4. @danielkerr

    test

    danielkerr committed Jul 1, 2016
  5. @danielkerr

    Merge pull request #4599 from opencart/master

    merge with latest brance
    danielkerr committed on GitHub Jul 1, 2016
  6. @danielkerr

    removed testing code

    danielkerr committed Jul 1, 2016
  7. @danielkerr
  8. @danielkerr

    session id change

    danielkerr committed Jul 1, 2016
  9. @danielkerr

    #4578

    danielkerr committed Jul 1, 2016
  10. @danielkerr
  11. @danielkerr
  12. @danielkerr
  13. @danielkerr