[cvs] commit: merk browse.php merk/carts edit.php merk/categories edit.php merk/checkout index.php merk/config conf.xml prefs.php.dist merk/invoices index.php merk/items edit.php index.php merk/lib Categories.php Deliveries.php Driver.php ...

Duck duck at obala.net
Sun Jul 23 11:47:00 PDT 2006 

duck        2006-07-23 11:47:00 PDT

  Modified files:
    .                    browse.php 
    carts                edit.php 
    categories           edit.php 
    checkout             index.php 
    config               conf.xml prefs.php.dist 
    invoices             index.php 
    items                edit.php index.php 
    lib                  Categories.php Deliveries.php Driver.php 
                         Invoices.php Merk.php 
    lib/Deliveries       sql.php 
    lib/Driver           sql.php 
    lib/Invoices         minerva.php sql.php 
    lib/Stock            null.php sql.php 
    locale/sl_SI/LC_MESSAGES merk.mo 
    po                   merk.pot sl_SI.po 
    stocks               edit.php 
    templates/browse     browse.html 
    templates/carts      edit.html 
    templates/items      index.html 
  Log:
  - Snow category name in the browsing title
  - Use vfs direct for category image too
  - Remove payment prefs, never implemented
  - Actually set the prefs values in the checkout
  - Change vfs direct config to be a string so other alias can be specified. For example web-servers with disabled sym-links.
  - Combine confusing double addresses
  - Some more clean ups and fixes
  
  Revision  Changes    Path
  1.21      +3 -2      merk/browse.php
  1.35      +3 -6      merk/carts/edit.php
  1.23      +4 -4      merk/categories/edit.php
  1.35      +18 -15    merk/checkout/index.php
  1.23      +2 -2      merk/config/conf.xml
  1.12      +26 -54    merk/config/prefs.php.dist
  1.20      +3 -2      merk/invoices/index.php
  1.35      +3 -3      merk/items/edit.php
  1.26      +3 -3      merk/items/index.php
  1.40      +69 -102   merk/lib/Categories.php
  1.2       +2 -2      merk/lib/Deliveries.php
  1.2       +15 -3     merk/lib/Deliveries/sql.php
  1.27      +2 -2      merk/lib/Driver.php
  1.68      +26 -64    merk/lib/Driver/sql.php
  1.6       +6 -1      merk/lib/Invoices.php
  1.7       +4 -6      merk/lib/Invoices/minerva.php
  1.5       +3 -5      merk/lib/Invoices/sql.php
  1.30      +6 -10     merk/lib/Merk.php
  1.3       +9 -13     merk/lib/Stock/null.php
  1.4       +4 -10     merk/lib/Stock/sql.php
  1.4       +18 -18    merk/locale/sl_SI/LC_MESSAGES/merk.mo
  1.31      +115 -162  merk/po/merk.pot
  1.5       +120 -167  merk/po/sl_SI.po
  1.17      +1 -2      merk/stocks/edit.php
  1.16      +2 -2      merk/templates/browse/browse.html
  1.8       +2 -2      merk/templates/carts/edit.html
  1.10      +1 -1      merk/templates/items/index.html

  Chora Links:
  http://cvs.horde.org/diff.php/merk/browse.php?r1=1.20&r2=1.21&ty=u
  http://cvs.horde.org/diff.php/merk/carts/edit.php?r1=1.34&r2=1.35&ty=u
  http://cvs.horde.org/diff.php/merk/categories/edit.php?r1=1.22&r2=1.23&ty=u
  http://cvs.horde.org/diff.php/merk/checkout/index.php?r1=1.34&r2=1.35&ty=u
  http://cvs.horde.org/diff.php/merk/config/conf.xml?r1=1.22&r2=1.23&ty=u
  http://cvs.horde.org/diff.php/merk/config/prefs.php.dist?r1=1.11&r2=1.12&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/index.php?r1=1.19&r2=1.20&ty=u
  http://cvs.horde.org/diff.php/merk/items/edit.php?r1=1.34&r2=1.35&ty=u
  http://cvs.horde.org/diff.php/merk/items/index.php?r1=1.25&r2=1.26&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Categories.php?r1=1.39&r2=1.40&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Deliveries.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Deliveries/sql.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver.php?r1=1.26&r2=1.27&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver/sql.php?r1=1.67&r2=1.68&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Invoices.php?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Invoices/minerva.php?r1=1.6&r2=1.7&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Invoices/sql.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Merk.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Stock/null.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Stock/sql.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/locale/sl_SI/LC_MESSAGES/merk.mo?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/po/merk.pot?r1=1.30&r2=1.31&ty=u
  http://cvs.horde.org/diff.php/merk/po/sl_SI.po?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/edit.php?r1=1.16&r2=1.17&ty=u
  http://cvs.horde.org/diff.php/merk/templates/browse/browse.html?r1=1.15&r2=1.16&ty=u
  http://cvs.horde.org/diff.php/merk/templates/carts/edit.html?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/merk/templates/items/index.html?r1=1.9&r2=1.10&ty=u

More information about the cvs mailing list