[interchange: 2/2] Merge branch 'master' of ssh://[email protected]/var/git/interchange
Greg Hanson <[email protected]>
| Newsgroups | gmane.comp.web.interchange.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit d80f9c2ad7139ce4e2b3b9d2b5321b11552e054e Merge: 48a1324... 956b727... Author: Greg Hanson <[email protected]> Date: Wed May 19 16:54:12 2010 -0400 Merge branch 'master' of ssh://[email protected]/var/git/interchange MANIFEST | 4 +- Makefile.PL | 2 +- README | 6 +- README.rpm-dist | 12 +- SPECS/interchange.spec | 2 +- WHATSNEW-5.7 | 34 ++- code/Filter/encode_special_entities.filter | 21 ++ code/OrderCheck/numeric.oc | 23 ++ code/OrderCheck/numeric_strict.oc | 21 ++ code/SystemTag/deliver.coretag | 4 + code/UserTag/css.tag | 10 +- code/UserTag/email.tag | 79 +++-- debian/changelog | 9 + debian/interchangeconfig | 14 +- dist/lib/UI/pages/admin/flex_editor.html | 5 - dist/standard/products/mv_metadata.asc | 2 +- eg/jedit/README | 64 ++-- eg/jedit/catalog | 489 +--------------------------- eg/jedit/html.xml | 186 ----------- eg/jedit/interchange.xml | 326 ++++++++++--------- lib/Vend/Data.pm | 7 +- lib/Vend/Dispatch.pm | 1 + lib/Vend/Error.pm | 4 +- lib/Vend/File.pm | 13 +- lib/Vend/Interpolate.pm | 2 +- lib/Vend/Parse.pm | 3 + lib/Vend/Payment/GoogleCheckout.pm | 1 + lib/Vend/Payment/Worldpay.pm | 1 + lib/Vend/Server.pm | 2 +- lib/Vend/Table/Common.pm | 26 +- lib/Vend/Table/DBI.pm | 1 + lib/Vend/Table/Editor.pm | 28 ++- lib/Vend/Table/GDBM.pm | 6 +- lib/Vend/UserDB.pm | 2 +- lib/Vend/Util.pm | 18 +- scripts/interchange.PL | 6 +- 36 files changed, 503 insertions(+), 931 deletions(-) ---