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

59 Commits

Author SHA1 Message Date
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
Stanislav Yordanov
e7e514dc77 Removed unused local variable, tab added, phpdoc tags fixed 2013-11-14 16:41:08 +02:00
Rémi Gaillard
2fe12b965b [-] Core: add possibility to choose the position of your css files 2013-11-13 15:31:29 +01:00
gRoussac
26a43260c5 [-] CORE : invalid method name in displayAjax method of Controller action 2013-11-05 10:18:53 +01:00
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Vincent Augagneur
3f4f298ad4 [-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin() 2013-10-07 10:01:26 +02:00
Damien Metzger
84a251a575 [*] BO : you can noww override header and footer for each controller 2013-10-02 17:04:18 +02:00
Rémi Gaillard
b2a9ec57bf // cache 2013-09-30 17:25:12 +02:00
Rémi Gaillard
c2857add42 // add color list on product listing 2013-09-30 17:19:02 +02:00
Rémi Gaillard
f0c5407aa6 // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
Rémi Gaillard
be250c9ecc // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
Andrew
a93cfbec07 Remove spaces before and after dot 2013-04-16 13:39:42 +04:00
Andrew
03eadb3d6a Remove spaces before and after dot 2013-04-16 13:39:42 +04:00
Andrew
9b6ff354ed [FIX] Critical bug in Cotroller class 2013-04-02 16:21:27 +04:00
Andrew
e002124e57 [FIX] Critical bug in Cotroller class 2013-04-02 16:21:27 +04:00
gRoussac
3ed335e80f [-] FO : Do no try to add empty css or js file name 2013-03-14 11:15:49 +01:00
gRoussac
2bb4c6c08a [-] FO : Do no try to add empty css or js file name 2013-03-14 11:15:49 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Damien Metzger
fb4777d536 [-] BO : fixed warnings on the anti-XSS page 2012-12-20 16:04:01 +01:00
Damien Metzger
caf96db460 [-] BO : fixed warnings on the anti-XSS page 2012-12-20 16:04:01 +01:00
vAugagneur
0de7579f58 //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur
12cb5316ee //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
2d30a966c3 [*] 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
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // 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
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
f0bf2da7e3 // Fix #PSCFV-4468 2012-09-28 13:08:48 +00:00
rGaillard
4f59cf4515 // Fix #PSCFV-4468 2012-09-28 13:08:48 +00:00
vAugagneur
8beebe8d4a [-] CORE : fixed bug #PSCFV-3916 2012-09-05 12:44:32 +00:00
vAugagneur
fede64204c [-] CORE : fixed bug #PSCFV-3916 2012-09-05 12:44:32 +00:00
rGaillard
e205eeb4d1 // Delete isXmlHttpRequest 2012-05-21 15:14:29 +00:00
rGaillard
9aac5773a1 // Delete isXmlHttpRequest 2012-05-21 15:14:29 +00:00
aFolletete
65a812aee9 // add comment 2012-05-21 09:42:19 +00:00
aFolletete
dd082a095c // add comment 2012-05-21 09:42:19 +00:00
aFolletete
9bb2a07e6f [+] Classes : include new method isXmlHttpRequest() in Controller class, allows to make ajax request without ajax=1 in GET parameter 2012-05-21 09:38:11 +00:00
aFolletete
ae79250e24 [+] Classes : include new method isXmlHttpRequest() in Controller class, allows to make ajax request without ajax=1 in GET parameter 2012-05-21 09:38:11 +00:00
mDeflotte
e3cebd34b9 // Fix bug with js inclusion 2012-05-18 15:25:33 +00:00
mDeflotte
62fa1bf83c // Fix bug with js inclusion 2012-05-18 15:25:33 +00:00
tDidierjean
d9a8fdd082 [-] BO : fix #PSCFV-2377 - missing JS files when saving product with errors 2012-05-16 13:31:44 +00:00
tDidierjean
a34564fc09 [-] BO : fix #PSCFV-2377 - missing JS files when saving product with errors 2012-05-16 13:31:44 +00:00
vChabot
04a3867b9b [-] FO : BugFix : #PSCFV-2243 : CCC optimization on scripts compile each script two times 2012-05-09 13:30:12 +00:00
vChabot
b15004b28f [-] FO : BugFix : #PSCFV-2243 : CCC optimization on scripts compile each script two times 2012-05-09 13:30:12 +00:00
lLefevre
72b8e2e12a [*] BO : #PSFV-832 : change the type of the property "ajax" 2012-04-16 13:24:28 +00:00
lLefevre
b1202ee5dd [*] BO : #PSFV-832 : change the type of the property "ajax" 2012-04-16 13:24:28 +00:00
rGaillard
3be00c8e6f // Fix backOffice order cart rules management 2012-03-15 14:42:57 +00:00