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

86 Commits

Author SHA1 Message Date
PhpMadman
0de9c3ac6c [*] BO : Added option to always rewrite friendly url of product 2013-12-03 10:57:25 +01:00
Felipe Uribe
5113125a0d Update AdminPPreferencesController.php 
Falta coma:

),
					'PS_DISPLAY_DISCOUNT_PRICE' => array(
 2013-11-22 07:23:09 -05: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
fram
28e1a94bb6 // instead instead of insted 2013-11-13 15:10:06 +01:00
PhpMadman
d95885caae [*] FO : Added posibilty to display new price instead of quantity discount 2013-11-06 14:41:42 +01:00
Damien Metzger
d93ea846a9 // Code cleaning and small fixes 2013-11-04 14:29:31 +01:00
Rémi Gaillard
3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Kevin Granger
3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Jerome Nadaud
75f0b38ff1 // Syntax error 2013-08-09 11:38:59 +02:00
Gregory Roussac
bf355e934e Merge pull request #634 from PhpMadman/RefSort 
[*] FO : Sort by Product reference
 2013-08-06 09:13:06 -07:00
PhpMadman
e4a42ab2b1 Update AdminPPreferencesController.php 2013-08-06 16:08:09 +02:00
PhpMadman
5e73f0cb07 [*] BO: Add reference to Options 2013-08-06 15:34:58 +02:00
Sarah Lorenzini
ca253bcda2 // update preferences tab 2013-07-31 17:43:48 +02:00
Rémi Gaillard
9257dc80c2 [-] BO: Fix #PSCFV-9455 stock was resetted if adv stock management is enable and product preference is submited on shop context 2013-06-26 14:17:45 +02:00
gRoussac
1a8ab7f68c [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
gRoussac
dcb46e7867 [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +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
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
vAugagneur
f97d51c84a //small fix 2012-11-05 09:38:30 +00:00
vAugagneur
6a18604639 //small fix 2012-11-05 09:38:30 +00: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
dMetzger
825ea5716b // F// Fixed misleading text #PSCFV-4291 2012-09-24 07:29:47 +00:00
dMetzger
45bc45d032 // F// Fixed misleading text #PSCFV-4291 2012-09-24 07:29:47 +00:00
lLefevre
0d4ff05960 [-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages 2012-05-15 10:04:43 +00:00
lLefevre
0129e7314a [-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages 2012-05-15 10:04:43 +00:00
bMancone
00797a49ee // Fixed #PSCFV-2175 2012-05-11 10:00:16 +00:00
bMancone
3580015da5 // Fixed #PSCFV-2175 2012-05-11 10:00:16 +00:00
bMancone
d5aa69fb02 // Fixed prefixes for the product_shop table 2012-04-18 09:24:43 +00:00
bMancone
00b208f9ce // Fixed prefixes for the product_shop table 2012-04-18 09:24:43 +00:00
bMancone
5e55b74e15 // Fixed exceptions when saving products 2012-04-17 15:56:04 +00:00
bMancone
e726bdd470 // Fixed exceptions when saving products 2012-04-17 15:56:04 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
lLefevre
652d2841c7 [-] BO : fixed #PSFV-727 (issue #9 to #13) 2012-04-05 13:51:40 +00:00
lLefevre
c669c21977 [-] BO : fixed #PSFV-727 (issue #9 to #13) 2012-04-05 13:51:40 +00:00
bMancone
ba21e8f132 // Fixed AdminPPreferencesController::postProcess() 2012-04-02 08:04:27 +00:00
bMancone
c3b0e98031 // Fixed AdminPPreferencesController::postProcess() 2012-04-02 08:04:27 +00:00
bMancone
55470e56a6 // It's not possible to activate/desactivate massively the advanced stock management for products 2012-03-30 09:23:27 +00:00
bMancone
11b45775b7 // It's not possible to activate/desactivate massively the advanced stock management for products 2012-03-30 09:23:27 +00:00
tDidierjean
60ad46c3d1 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00
tDidierjean
e0664df6f8 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00