dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f7d346ba994bc4bbaffacdc7be3737972e132d67
PrestaShop/themes/default
T
History
Kevin Granger 889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
2013-11-04 14:43:01 +01:00
..
cache
// Welcome 2013
2013-01-04 11:19:03 +01:00
css
[-] FO : Fix bug #PSCFV-10889 wrong color when oos product
2013-10-31 10:18:28 +01:00
img
// Welcome 2013
2013-01-04 11:19:03 +01:00
js
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
lang
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
mobile
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
2013-10-24 18:36:36 +02:00
modules
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
pdf
// Welcome 2013
2013-01-04 11:19:03 +01:00
404.tpl
// W3C
2013-06-06 15:27:29 +02:00
address.tpl
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
addresses.tpl
// W3C
2013-06-06 15:27:29 +02:00
authentication.tpl
[-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879
2013-10-24 10:00:19 +02:00
best-sales.tpl
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00
breadcrumb.tpl
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
category-cms-tree-branch.tpl
// Welcome 2013
2013-01-04 11:19:03 +01:00
category-count.tpl
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
category-tree-branch.tpl
// Welcome 2013
2013-01-04 11:19:03 +01:00
category.tpl
[-] FO : FixBug #PSCFV-10542 - Category description view problem
2013-10-01 10:20:33 +02:00
cms.tpl
[-] FO : Report of #PSCFI-7240 typos in cms.tpl
2013-06-06 10:39:03 +02:00
config.xml
[+] Project : default theme added
2011-12-02 15:24:40 +00:00
contact-form.tpl
[-] BO : fix pre-selection of id_contact in contact-form.tpl
2013-09-30 14:38:06 +02:00
discount.tpl
// W3C
2013-06-06 15:27:29 +02:00
errors.tpl
// Welcome 2013
2013-01-04 11:19:03 +01:00
footer.tpl
// Welcome 2013
2013-01-04 11:19:03 +01:00
guest-tracking.tpl
// W3C
2013-06-06 15:27:29 +02:00
header.tpl
// Protected smarty variable in JS
2013-06-27 16:41:57 +02:00
history.tpl
// W3C
2013-06-06 15:27:29 +02:00
identity.tpl
[*] FO : Fix bug #PSCFV-9611, autocomplete to off on opc page and other pages
2013-07-25 12:26:57 +02:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
index.tpl
[*] FO : New hooks for home tabs
2013-10-16 11:44:55 +02:00
layout.tpl
[-] BO : FixBug Missing tpl dir in default layout
2013-08-07 11:17:42 +02:00
maintenance.tpl
[+] Added hook in maintenance page
2013-10-02 11:58:35 +02:00
manufacturer-list.tpl
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
manufacturer.tpl
[-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden.
2013-10-28 14:48:48 +01:00
my-account.tpl
// W3C
2013-06-06 15:27:29 +02:00
nbr-product-page.tpl
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00
new-products.tpl
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00
order-address-multishipping-products.tpl
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
order-address-multishipping.tpl
//replace some escape:'html' by addslashes in .tpl with javascript
2013-06-28 11:06:08 +02:00
order-address-product-line.tpl
// W3C
2013-06-06 15:27:29 +02:00
order-address.tpl
// Javascript error if address does not exist
2013-08-12 11:57:40 +02:00
order-carrier.tpl
[-] FO : Fix bug #PSCFV-10688, bad priceDisplay in order-carrier
2013-10-14 15:34:47 +02:00
order-confirmation.tpl
// W3C
2013-06-06 15:27:29 +02:00
order-detail.tpl
[-] FO : Prevent fatal error on getUniqReference when order not loaded
2013-10-23 11:44:12 +02:00
order-follow.tpl
[-] BO : Order-follow displayed order id instead of order reference
2013-10-29 14:53:50 +01:00
order-opc-new-account.tpl
FO : https://github.com/PrestaShop/PrestaShop/pull/878
2013-10-24 12:03:33 +02:00
order-opc.tpl
//replace some escape:'html' by addslashes in .tpl with javascript
2013-06-28 11:06:08 +02:00
order-payment.tpl
[-] FO : Fix bug #PSCFV-9669, update total price on order-payment
2013-07-04 17:25:00 +02:00
order-return.tpl
// W3C
2013-06-06 15:27:29 +02:00
order-slip.tpl
// W3C
2013-06-06 15:27:29 +02:00
order-steps.tpl
[-] FO : Fix bug #PSCFV-9754 do not use back url on cart summary link in steps
2013-07-12 16:59:11 +02:00
pagination.tpl
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00
password.tpl
[-] BO : FixBug smarty email variable override by blockcontact
2013-08-07 15:09:14 +02:00
preview.jpg
//preview picture
2012-05-21 18:19:37 +00:00
prices-drop.tpl
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00
product-compare.tpl
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00
product-list-colors.tpl
[*] FO: You can now choose the anchor separator for attributes
2013-10-09 11:01:18 +02:00
product-list.tpl
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
product-sort.tpl
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00
product.tpl
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
products-comparison.tpl
// W3C
2013-06-06 15:27:29 +02:00
restricted-country.tpl
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
scenes.tpl
// W3C
2013-06-06 15:27:29 +02:00
search.tpl
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
shopping-cart-product-line.tpl
[-] FO : FixBug #PSCFV-9951 Syntax error - Thanks to Oleacorner-Olivier B
2013-07-29 17:44:14 +02:00
shopping-cart.tpl
Merge pull request #528 from ldecoker/patch-7
2013-08-06 09:57:36 -07:00
sitemap.tpl
// W3C
2013-06-06 15:27:29 +02:00
store_infos.tpl
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
stores.tpl
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
supplier-list.tpl
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
supplier.tpl
Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id
2013-08-13 18:26:22 +02:00