dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph

47 Commits

Author SHA1 Message Date
rGaillard
ae98bcd86b // php warning 2013-12-06 18:40:44 +01:00
rGaillard
746c74dfac // id of root category could be different of 1 2013-12-06 18:34:50 +01:00
gRoussac
2b210e0732 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 2013-11-27 16:20:20 +01:00
Kevin Granger
9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
 2013-11-21 17:43:51 +01:00
Jerome Nadaud
50eee795ed // Add truncate category description preserving html tags 2013-11-15 11:03:06 +01:00
Rémi Gaillard
855c8a8de4 // add 2 useful hooks 2013-11-07 18:33:49 +01:00
Rémi Gaillard
0db2372724 // add color list to some controllers 2013-10-08 15:39:06 +02:00
Rémi Gaillard
eb40f7db24 // Improve cache colors list 2013-09-30 18:48:59 +02:00
Rémi Gaillard
c2857add42 // add color list on product listing 2013-09-30 17:19:02 +02:00
Vincent Augagneur
ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Vincent Augagneur
8a0745e8de [-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore 2013-08-19 17:21:03 +02:00
Krystian Podemski
8051b0021e [*] CORE : Get instance of current category in category controller 
Get instance of category in for eg. module hook using:

$category = $this->context->controller->getCategory()

instead of

new Category(1,1);
 2013-08-13 14:52:59 +02:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
Rémi Gaillard
4d76877ec6 [-] FO: Fix PHP warning on category controller 2012-12-31 10:04:53 +01:00
vAugagneur
17350c6149 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
vAugagneur
0de7579f58 //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur
49e1a536e3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
Rémi Gaillard
3e2de4986b [-] FO: Fix: many fixes - domain for cookies with different url for ssl / add to cart button for minimal quantities with product attributes 2012-11-20 19:05:21 +01:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
9ca44ba0f4 [-] FO : mobile theme : fix #PSCFV-4275 : delete calls to css and js not used 2012-09-24 12:47:49 +00:00
sLorenzini
93aae4afaa // Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242 2012-09-21 14:59:51 +00:00
rMalie
8f360f6d9e // Improve multishop code 2012-05-25 13:37:43 +00:00
vChabot
1a23d41bab [-] FO : Bugfix : Assigning subcategories to the template 2012-03-06 08:52:55 +00:00
rMalie
8a24c0a741 // Retro-compatibility fix of front controllers 2012-03-05 15:32:06 +00:00
mDeflotte
ba6ebaa536 // Fix bug with a bad smarty var assignation 2012-02-27 15:40:38 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
rMalie
29b42505d7 // Normalize 2012-01-25 16:13:36 +00:00
aNiassy
cf93bf1b8e [-] FO : fixed an error of assign variable with smarty 2012-01-16 14:38:21 +00:00
vChabot
c0cf59d93f [*] BO : Adding category management with multishop 2012-01-09 15:13:46 +00:00
rMalie
a776684f13 // Rename correctly all hooks 2012-01-02 15:52:40 +00:00
vChabot
00c907bf7a // removing categories assocation with shop 2011-12-21 16:18:24 +00:00
vChabot
42ac9fb33f [*] BO : New category management with multi shop 2011-12-20 17:36:08 +00:00
mDeflotte
1a5a08cefb // BugFix 2011-12-15 10:50:42 +00:00
mMarinetti
fa4c63a449 // Add missing call of parent::initContent() in all front class (when initContent exists) 2011-12-14 16:22:50 +00:00
rMalie
82c9dead2a // Merge -> 10309 2011-11-21 11:05:10 +00:00
fSerny
d5e265f75e [*] PROJECT : New Module API (part 1) 2011-11-02 10:49:01 +00:00
vAugagneur
e8901103e3 [+] Classes : added new class Media => It contains all the method related to media like CSS, JS 
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin()
[~] Deprecated : All method related to CCC has been moved in class Media
 2011-09-30 13:01:10 +00:00
mDeflotte
4c96d930cd // CaregoryController : FixBug : Product list must be assigned to the template AFTER being calculated 2011-09-30 07:22:42 +00:00
rMalie
12ecd22c7c // Refacto of CategoryController 2011-09-29 16:31:32 +00:00
rMalie
12c36b21b2 // Fix bugs on frontControllers 2011-09-27 15:28:41 +00:00
rMalie
91083e190c // Merge -> revision 8800 2011-09-27 14:30:06 +00:00
rMalie
65e0f2d54f // Fix strict standard on controllers + modules header / footer include 2011-09-23 08:05:31 +00:00
rMalie
04f3779780 [*] Front: move front controllers in controllers/front/ directory 
// Refactoring of front controllers part 1
 2011-09-22 15:19:42 +00:00