Merge master

Browse Source

...

This commit is contained in:

gmorel

2013-11-27 20:24:37 +01:00

parent 612bd1adae

commit dc648fef62

225 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

templates/frontOffice/default/404.html Normal file → Executable file

0

templates/frontOffice/default/account-password.html Normal file → Executable file

0

templates/frontOffice/default/account-update.html Normal file → Executable file

0

templates/frontOffice/default/account.html Normal file → Executable file

0

templates/frontOffice/default/address-update.html Normal file → Executable file

0

templates/frontOffice/default/address.html Normal file → Executable file

0

templates/frontOffice/default/assets/img/218x146.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 KiB

0

templates/frontOffice/default/assets/img/280x196.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

0

templates/frontOffice/default/assets/img/700x320.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

0

templates/frontOffice/default/assets/img/ajax-loader.gif Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 13 KiB

0

templates/frontOffice/default/assets/img/carousel/1200x390.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 11 KiB After Width:  |  Height:  |  Size: 11 KiB

0

templates/frontOffice/default/assets/img/carousel/slider1.jpg Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 97 KiB After Width:  |  Height:  |  Size: 97 KiB

0

templates/frontOffice/default/assets/img/carousel/slider2.jpg Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 92 KiB After Width:  |  Height:  |  Size: 92 KiB

0

templates/frontOffice/default/assets/img/carousel/slider3.jpg Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 41 KiB After Width:  |  Height:  |  Size: 41 KiB

0

templates/frontOffice/default/assets/img/favicon.ico Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

templates/frontOffice/default/assets/img/favicon.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

templates/frontOffice/default/assets/img/logo.gif Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 KiB

0

templates/frontOffice/default/assets/img/payment/american-express.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 3.7 KiB

0

templates/frontOffice/default/assets/img/payment/cheque.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 4.0 KiB

0

templates/frontOffice/default/assets/img/payment/kwixo.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

0

templates/frontOffice/default/assets/img/payment/mastercard.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 3.6 KiB

0

templates/frontOffice/default/assets/img/payment/visa.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

templates/frontOffice/default/assets/img/product/1/118x85.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

0

templates/frontOffice/default/assets/img/product/1/560x445.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.2 KiB After Width:  |  Height:  |  Size: 6.2 KiB

0

templates/frontOffice/default/assets/js/libs/jquery.js vendored Normal file → Executable file

0

templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.js vendored Normal file → Executable file

0

templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.min.js vendored Normal file → Executable file

0

templates/frontOffice/default/assets/js/script.js Normal file → Executable file

0

templates/frontOffice/default/assets/less/fontawesome/bootstrap.less vendored Normal file → Executable file

0

templates/frontOffice/default/assets/less/fontawesome/core.less vendored Normal file → Executable file

0

templates/frontOffice/default/assets/less/fontawesome/extras.less vendored Normal file → Executable file

0

templates/frontOffice/default/assets/less/fontawesome/font-awesome-ie7.less vendored Normal file → Executable file

0

templates/frontOffice/default/assets/less/fontawesome/font-awesome.less vendored Normal file → Executable file

0

templates/frontOffice/default/assets/less/fontawesome/icons.less vendored Normal file → Executable file

0

templates/frontOffice/default/assets/less/fontawesome/mixins.less vendored Normal file → Executable file

0

templates/frontOffice/default/assets/less/fontawesome/path.less vendored Normal file → Executable file

0

templates/frontOffice/default/assets/less/fontawesome/variables.less vendored Normal file → Executable file

0

templates/frontOffice/default/assets/less/thelia/account.less Normal file → Executable file

0

templates/frontOffice/default/assets/less/thelia/buttons.less Normal file → Executable file

0

templates/frontOffice/default/assets/less/thelia/cart.less Normal file → Executable file

0

templates/frontOffice/default/assets/less/thelia/category.less Normal file → Executable file

0

templates/frontOffice/default/assets/less/thelia/checkout.less Normal file → Executable file

0

templates/frontOffice/default/cart.html Normal file → Executable file

0

templates/frontOffice/default/category.html Normal file → Executable file

0

templates/frontOffice/default/contact-success.html Normal file → Executable file

0

templates/frontOffice/default/contact.html Normal file → Executable file

0

templates/frontOffice/default/content.html Normal file → Executable file

0

templates/frontOffice/default/currency.html Normal file → Executable file

0

templates/frontOffice/default/includes/addedToCart.html Normal file → Executable file

0

templates/frontOffice/default/includes/asides/articles.html Normal file → Executable file

0

templates/frontOffice/default/includes/categories-filters.html Normal file → Executable file

0

templates/frontOffice/default/includes/menu.html Normal file → Executable file

0

templates/frontOffice/default/includes/mini-cart.html Normal file → Executable file

0

templates/frontOffice/default/includes/product-empty.html Normal file → Executable file

0

templates/frontOffice/default/includes/single-product.html Normal file → Executable file

0

templates/frontOffice/default/includes/toolbar.html Normal file → Executable file

0

templates/frontOffice/default/index.html Normal file → Executable file

0

templates/frontOffice/default/language.html Normal file → Executable file

0

templates/frontOffice/default/layout.tpl Normal file → Executable file

0

templates/frontOffice/default/login.html Normal file → Executable file

0

templates/frontOffice/default/misc/breadcrumb.tpl Normal file → Executable file

0

templates/frontOffice/default/misc/checkout-progress.tpl Normal file → Executable file

0

templates/frontOffice/default/modal-address.html Normal file → Executable file

0

templates/frontOffice/default/newsletter.html Normal file → Executable file

0

templates/frontOffice/default/order-delivery.html Normal file → Executable file

0

templates/frontOffice/default/order-invoice.html Normal file → Executable file

0

templates/frontOffice/default/order-placed.html Normal file → Executable file

0

templates/frontOffice/default/password.html Normal file → Executable file

0

templates/frontOffice/default/product.html Normal file → Executable file

0

templates/frontOffice/default/register.html Normal file → Executable file

0

templates/frontOffice/default/search.html Normal file → Executable file

0

templates/frontOffice/default/view_all.html Normal file → Executable file