[interchange: 2/2] Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange
Mike Heins <[email protected]> Mon, 14 Mar 2016 15:34:08 +0000
| Newsgroups | gmane.comp.web.interchange.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 652f755d96df3f1e68a4f8ae61865b17218a8135 Merge: 9cffe13... 86fbcb1... Author: Mike Heins <[email protected]> Date: Mon Mar 14 11:33:44 2016 -0400 Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange .gitignore | 2 + MANIFEST | 7 +- Makefile.PL | 4 +- README | 8 +- README.rpm-dist | 12 +- SPECS/interchange.spec | 5 +- WHATSNEW-5.10 | 66 ++ WHATSNEW-5.8 | 19 - code/Filter/strip_path.filter | 2 +- configure | 2 +- dist/lib/UI/pages/include/menus/Admin.txt | 3 +- dist/lib/UI/pages/include/menus/MiscFunction.txt | 11 +- dist/strap/dbconf/pgsql/stock_alert.pgsql | 4 +- dist/strap/products/mv_metadata.asc | 2 +- {dist/lib/UI/pages/admin => eg}/test_code.html | 5 + lib/Vend/External.pm | 9 +- lib/Vend/MakeCat.pm | 2 +- lib/Vend/Parse.pm | 1 + lib/Vend/Payment/GoogleCheckout.pm | 1342 ---------------------- lib/Vend/Payment/PayflowPro.pm | 2 +- lib/Vend/Payment/Protx2.pm | 2 +- lib/Vend/Payment/TestPayment.pm | 2 +- lib/Vend/Table/DBI.pm | 22 +- lib/Vend/Util.pm | 2 +- scripts/interchange.PL | 12 +- 25 files changed, 139 insertions(+), 1409 deletions(-) ---