Permalink
Commits on Nov 23, 2016
  1. Merge pull request #555 from haraldpdl/db_connection

    Db connection
    committed on GitHub Nov 23, 2016
  2. throw a custom exception when a connection to the database fails; add…

    … $options parameter to disable error logging
    committed Nov 23, 2016
Commits on Nov 21, 2016
  1. Merge pull request #548 from haraldpdl/jquery

    update admin to jQuery 3.1.1; replace deprecated jQuery size() functi…
    committed on GitHub Nov 21, 2016
  2. update admin to jQuery 3.1.1; replace deprecated jQuery size() functi…

    …on call with .length
    committed Nov 21, 2016
  3. Merge pull request #547 from haraldpdl/v242

    V242
    committed on GitHub Nov 21, 2016
  4. update pdf

    committed Nov 21, 2016
  5. update changelog

    committed Nov 21, 2016
  6. Merge pull request #546 from haraldpdl/GTIN

    Gtin
    committed on GitHub Nov 21, 2016
  7. Merge pull request #545 from haraldpdl/gergely-issue_499

    Gergely issue 499
    committed on GitHub Nov 21, 2016
  8. fix usage of variable

    committed Nov 21, 2016
  9. fix variable

    committed Nov 21, 2016
  10. fix variables

    committed Nov 21, 2016
  11. revert plain email definitions to original key names; change OSC\OM\M…

    …ail::setBody() to accept a text email and form a html version from that if none is provided as a second parameter; add HTML and Plain tabs for email content on the Admin Mail and Admin Newsletters pages
    committed Nov 21, 2016
Commits on Nov 20, 2016
  1. GTIN

    Admin Side
    Update Shop Side Module
    Update DB Schema
    Update SQL Installer
    gburton committed Nov 20, 2016
  2. Line break fix for HTML part

    Gergely committed Nov 20, 2016
  3. Merge branch 'upstream_master' into issue_499

    # Conflicts:
    #	catalog/admin/mail.php
    Gergely committed Nov 20, 2016
  4. Merge pull request #543 from haraldpdl/query_fix

    remove group by as it's not needed and mysql does not return 0 on "se…
    committed on GitHub Nov 20, 2016
  5. Merge pull request #542 from gburton/Bootstrap_Updates

    Bootstrap Updates
    committed on GitHub Nov 20, 2016
  6. Merge pull request #541 from haraldpdl/mail_fix

    Mail fix
    committed on GitHub Nov 20, 2016
  7. remove group by as it's not needed and mysql does not return 0 on "se…

    …lect count(*) .. group by .." when no records exist. (fix #509)
    committed Nov 20, 2016
  8. Admin email fixes

    Gergely committed Nov 20, 2016
  9. Fix HTML form tags

    Gergely committed Nov 20, 2016
  10. Merge pull request #51 from osCommerce/master

    Master Update
    gburton committed on GitHub Nov 20, 2016
  11. don't clear all of the headers as $body might already be defined (whi…

    …ch sets mime headers)
    committed Nov 20, 2016
  12. don't sanitize from otherwise it becomes "name _email-address_" inste…

    …ad of "name <email-address>"
    committed Nov 20, 2016
  13. Merge pull request #540 from Gergely/issue_503

    Prevent prefix inject (fix 503)
    committed on GitHub Nov 20, 2016
  14. Merge pull request #539 from haraldpdl/customers_search

    add missing search values (fix #502)
    committed on GitHub Nov 20, 2016
  15. Merge pull request #538 from haraldpdl/footer_banner

    declare functions as static (fix #500)
    committed on GitHub Nov 20, 2016