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

637 Commits

Author SHA1 Message Date
Jerome Nadaud
63a04fd2dd // Fix remove filename from file input when logo removed 2013-12-11 09:39:01 +01:00
Jerome Nadaud
05f3c259e0 [-] BO : FixBug #PSCSX-37 - Double upload in carrier wizard 2013-12-10 16:59:51 +01:00
Jerome Nadaud
992dddcbb4 // Virtual Product bootsraping 2013-12-10 13:51:34 +01:00
Vincent Augagneur
669a49be59 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 10:17:12 +01:00
Vincent Augagneur
c2e0edcc7a [-] BO : carrier wizard no fees display 2013-12-06 10:17:07 +01:00
Vincent Augagneur
7117a6f4fd [-] BO : fixed bug #PSCSX-76 - carrier wizard fees not display after reload carrier 2013-12-05 10:35:51 +01:00
Vincent Augagneur
b1304f0379 //carrier wizard range table auto size 2013-12-04 18:27:08 +01:00
Lucas CERDAN
da2d48890f Merge pull request #1072 from PhpMadman/Boot-AutoSeoUrl 
[*] BO : Option to always rewrite friendly url of product
 2013-12-03 06:15:28 -08:00
PhpMadman
0de9c3ac6c [*] BO : Added option to always rewrite friendly url of product 2013-12-03 10:57:25 +01:00
Vincent Augagneur
0a2ba0015b [-] BO : carrier wizard, remove fees when desabled zone 2013-12-03 10:34:53 +01:00
TMMeilleur
f99140113b updated jqzoom and products compare page is responsive now 2013-12-02 16:41:13 +02:00
Damien Metzger
782975c708 [-] BO : better error display for forgotten password #PSCSX-58 2013-11-29 18:18:55 +01:00
Vincent Augagneur
66947b5354 //multiple small fix on carrier wizard 2013-11-28 17:38:05 +01:00
gRoussac
69c99f49c9 [-] BO : Merge of b7b79ff461 2013-11-26 15:27:59 +01:00
gRoussac
8a7d39d800 [-] BO : Undefined on image upload, revert of 48b7a49b1a 2013-11-25 22:58:22 +01:00
Jerome Nadaud
47b7bf5458 // Adding some style to tinymce 2013-11-25 19:05:58 +01:00
Jerome Nadaud
a81ee41374 // Fix missing saving button in products 2013-11-25 18:01:01 +01:00
rGaillard
375981378f // typo 2013-11-25 16:44:08 +01: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
Vincent Augagneur
8148d5696d [-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos 2013-11-20 15:20:44 +01:00
Vincent Augagneur
0299f3f0cd [-] BO : fixed bug #PSCSX-32 class-danger on mail send error 2013-11-20 14:56:31 +01:00
Damien Metzger
b62952accf [*] BO : Added simulation mode to the dashboard 2013-11-15 18:07:23 +01:00
Jerome Nadaud
67eeae0fa2 // Set visibility on help button 2013-11-14 14:42:35 +01:00
gRoussac
6393746f04 [-] BO : 406 when mod_security follow up 034e6a7e7f 2013-11-14 11:43:05 +01:00
Vincent Augagneur
9a0b308846 //remove preactivationLink ajax and move in gamification module 2013-11-14 10:54:29 +01:00
Kevin Granger
9c4ee27f20 // mobile nav WIP 2013-11-07 21:48:55 +01:00
gRoussac
7cc351e83d [-] BO : Fix bug #PSCFV-10932, ranges input disabled on load 2013-11-07 15:11:30 +01:00
Vincent Augagneur
9e76f82fb5 //merge 2013-11-07 12:06:58 +01:00
Vincent Augagneur
3c31f1a07f //dashconfig errors return 2013-11-07 12:05:03 +01:00
Kevin Granger
866e7f831b // fixs highlight search 2013-11-06 19:26:22 +01:00
Jerome Nadaud
616cc91eb2 // Fix bug JQuery on handler 2013-11-06 15:49:44 +01:00
Jerome Nadaud
56230a1f53 // Live is deprecated in jquery 1.9 2013-11-06 15:34:46 +01:00
Jerome Nadaud
fcb225ac5a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-06 12:19:15 +01:00
Jerome Nadaud
0c1b77b3da // Fix Combinations list actions button problem 2013-11-06 12:18:52 +01:00
Kevin Granger
05c71145c2 // dashboard 2013-11-06 12:14:49 +01:00
Damien Metzger
ad7dfca9e1 // RSS date on the dashboard 2013-11-05 16:55:55 +01:00
Rémi Gaillard
161145fb34 // small fix 2013-11-05 15:35:14 +01:00
Rémi Gaillard
a5bb0486e6 // fix email validator && allow to convert unicode without classes 2013-11-05 15:06:22 +01:00
Vincent Augagneur
e710942833 //small fix on dashboard config save 2013-11-05 10:22:22 +01:00
Damien Metzger
8dc29b20f0 // Code cleaning and dashgoals improvements (part 1 - not finished yet) 2013-11-04 18:52:27 +01:00
Vincent Augagneur
5386a4547b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:57:50 +01:00
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
Vincent Augagneur
d571920806 //small fix 2013-11-04 11:09:53 +01:00
Rémi Gaillard
930c9f3ff5 // validators 2013-11-02 10:50:02 +01:00
Rémi Gaillard
8a7f869515 // small graphical bug 2013-10-31 10:41:15 +01:00
Vincent Augagneur
6a3e711cff //small fix 2013-10-30 15:43:31 +01:00
Vincent Augagneur
ad68105467 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-30 10:52:04 +01:00
Vincent Augagneur
0020412aea //added Preactivation request on dashboard 2013-10-30 10:51:58 +01:00
Kevin Granger
5fa36abcaf // fixs UI 2013-10-29 17:32:57 +01:00