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

60 Commits

Author SHA1 Message Date
TMMeilleur f99140113b updated jqzoom and products compare page is responsive now 2013-12-02 16:41:13 +02:00
rGaillard 88ad2010d6 // add padding and margin to automplete width #PSCFV-5876 2013-11-22 16:41:25 +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
gRoussac 6393746f04 [-] BO : 406 when mod_security follow up https://github.com/PrestaShop/PrestaShop/commit/034e6a7e7f391e3a8861248db45a4a376b19633c 2013-11-14 11:43:05 +01:00
Kevin Granger 866e7f831b // fixs highlight search 2013-11-06 19:26:22 +01:00
Rémi Gaillard 2e65214c39 // manually merge of modules search 2013-10-16 11:36:40 +02:00
Fabio Chelly 2515d81bdd [*] BO Module search: Quick search can now search modules by name and not only display name 2013-10-07 11:34:16 +02:00
Vincent Augagneur 8a6dc6233d //jquery.smartWizard use bootstrap css classes 2013-10-07 09:08:20 +02:00
Fabio Chelly 139a74e4cd [*] BO Module search: the PHP search has been replace by a quick search in JS to display results instantly 2013-10-04 18:15:12 +02:00
Vincent Augagneur 5564b342f4 //wizard boostrap and title fix 2013-10-04 17:07:10 +02:00
Kevin Granger a53080eefc // fix bug css 2013-09-17 12:32:36 +02:00
Kevin Granger 5c04e5564c // tags + fixed-width 2013-09-17 11:59:57 +02:00
Jérôme Nadaud 0ab792cc6e // Change tagify class 2013-09-17 10:52:21 +02:00
Jerome Nadaud a4103265e5 // Color picker 2013-09-16 18:17:29 +02:00
Jerome Nadaud 29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +02:00
Kevin Granger 32b50b4dad // small fix on carriers wizard ( remove original css, and change js add/remove class .error to .errorStep) 2013-08-01 20:25:36 +02:00
Damien Metzger ebe8d6294d // CSS fix for carrier wizard 2013-08-01 09:34:07 +02:00
Rémi Gaillard c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Damien Metzger 87a4b75df4 [*] FO : updated Fancybox plug-in 2013-07-23 12:53:20 +02:00
Jérôme Nadaud 1581a371c5 [-] BO : FixBug #PSCFV-9251 Meta Tag delete previous 2013-07-19 18:41:46 +02:00
gRoussac 311ad3087c // small fix when rel of big pic is empty 2013-05-02 17:06:32 +02:00
gRoussac 6cdf8babca [-] Fo : Fix big pic alt with jqzoom 2013-04-16 10:22:46 +02:00
gRoussac df90cab2db [-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader 2013-03-14 16:53:26 +01:00
vAugagneur a0bc26c22c [-] FO : fixed bug #PSCFV-7508 - broken links to images in jquery.fancybox.css 2013-01-28 17:47:18 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
sLorenzini bdb5e43a38 [-] FO : fixed bug #PSCFV-5481 2012-11-16 10:29:14 +00:00
lLefevre 946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre 04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00: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
vAugagneur 3bb7cf33dd [-] CORE : fixed bug #PSCFV-4366 2012-09-26 12:43:50 +00:00
lLefevre 43a3d2e05d [-] BO : fix #PSCFV-3101 2012-07-09 13:55:13 +00:00
rMalie a0efaf6af7 // Fix critical spelling bug on jquery cookie file name 2012-06-12 13:12:32 +00:00
rMalie 8922588507 // Rename jquery.cookie with jquery.cooki (because of apache security mod ...) 2012-06-05 13:27:53 +00:00
lLefevre e4e0758853 [-] BO : #PSCFV-2581 : Minify Jquery Ajax File Uploader version 2.1 2012-05-30 07:44:51 +00:00
lLefevre 29f5a8569b [-] BO : fix #PSCFV-2581 : update Jquery Ajax File Uploader in version 2.1 2012-05-29 13:35:53 +00:00
rGaillard 6e8f249ce0 [*] Core: Upgrade of ajaxfileupload library 2012-05-28 12:37:11 +00:00
rMalie d7337c4d4f // Multishop interface reworked 2012-05-09 15:05:39 +00:00
rMalie f5618698de // Rename treeview to treeview-categories 2012-05-03 08:10:10 +00:00
rMalie 49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
mDeflotte 50f527beea [-] FO : #PSFV-706 - Fix problem with jqzoom and dom with relative position 2012-03-23 13:53:55 +00:00
François Gaillard b1437694a0 [-] Classes : #PSFV-634 : BugFix Currency was not set for loyalty discounts 2012-03-13 17:06:42 +00:00
fBrignoli 69c7c92a52 [-] BO : Bug Fixed #PSTEST-822 - You can now set datetime to configure specific price boundaries 2012-02-24 09:13:03 +00:00
rMalie 670b5bf7de // Improve multishop ergonomy (new toolbar) 2012-02-15 10:04:05 +00:00
vKham bf7acc1d11 // change layout dashboard flexible, add button change view module list normal favorite 2012-01-30 17:26:28 +00:00
mBertholino c433695962 [-] BO : #PSTEST-563 : if a customer clicks outside of the fancybox, he won't loose all the data that were already in the box. To leave the fancybox, the customer must click on the close button 2012-01-24 09:16:22 +00:00
tDidierjean 656756464f // Update lib jquery.flot.js => fix stats graph on homepage with IE9. 2012-01-05 14:22:41 +00:00
mMarinetti f6e00e62a1 // removed draggable option in jquery.alerts config 2012-01-04 14:34:26 +00:00