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

63 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
Davy Rolink
cd58c0968b Fixed admin toolbar save button javascript actions, problem occurred when there were multiple toolbars on one page 2013-11-16 14:59:37 +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
Rémi Gaillard
6d5ca9969e // js error 2013-10-29 17:56:29 +01:00
Jerome Nadaud
b605f33359 [-] BO : FixBug #PSCFV-10866 - Tagify system not working 2013-10-29 12:07:30 +01:00
Damien Metzger
28118cf33a // Code cleaning (backoffice javascript) 2013-10-11 10:47:48 +02:00
Jerome Nadaud
e1ff774fcd // Restoring toolbar.tpl file for retrocompatibility 2013-10-09 16:42:13 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
gRoussac
f293562ea4 [-] BO : Fix bug #PSCFV-8214 import entity pre selected 2013-09-18 15:03:16 +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
5e2a3e3c13 [+] BO : Modal module list 2013-08-13 15:22:18 +02:00
Kevin Granger
ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
gRoussac
a98740d25c // small change, switch two buttons in list_header 2013-08-05 16:39:29 +02:00
Kevin Granger
1f33638f32 [+] BO Wip BS -> Products + fix 2013-07-05 18:36:42 +02:00
Kevin Granger
aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
Rémi Gaillard
7a91d4b4dd // small fix on toolbar 2013-06-13 19:23:58 +02:00
Kevin Granger
86ef69c9ba [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:03:34 +02:00
Damien Metzger
db70f38a89 // Fixed module list 2013-03-22 16:50:46 +01:00
Damien Metzger
571f566af0 // Fixed module list 2013-03-22 16:50:46 +01:00
Damien Metzger
a33c6ff54b // This reverts commit 9ebe9e1894. "Changed modules list button" 2013-03-11 14:05:38 +01:00
Damien Metzger
7bd2bb9cb6 // This reverts commit 9ebe9e1894. "Changed modules list button" 2013-03-11 14:05:38 +01:00
Damien Metzger
9ebe9e1894 // Changed modules list button (Sarah needed here!) 2013-02-25 12:16:58 +01:00
Damien Metzger
d4a6a56d1b // Changed modules list button (Sarah needed here!) 2013-02-25 12:16:58 +01:00
vAugagneur
0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
vAugagneur
947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
vAugagneur
bc203bfc3a [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
vAugagneur
ab3226d9d2 [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
vAugagneur
4523f4c849 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
vAugagneur
517e90da43 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
vAugagneur
796b02bb68 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
vAugagneur
d72a5d4d94 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +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
dMetzger
ff7582190f // Forgot to comment a CDATA in javascript 2012-08-20 15:06:58 +00:00
dMetzger
666a449fca // Forgot to comment a CDATA in javascript 2012-08-20 15:06:58 +00:00
dMetzger
1925df40fa // Tpl cleaning 2012-08-20 08:27:12 +00:00
dMetzger
f90b9c140f // Tpl cleaning 2012-08-20 08:27:12 +00:00
mDeflotte
804e2e51ac [-] BO : #PSCFV-3111 - Avoid double click on saving button 2012-07-09 09:10:04 +00:00
mDeflotte
3d1c143428 [-] BO : #PSCFV-3111 - Avoid double click on saving button 2012-07-09 09:10:04 +00:00
lLefevre
0b8dc08acf [-] BO : Fix W3C errors 2012-07-06 14:32:35 +00:00
lLefevre
f36f1c03d1 [-] BO : Fix W3C errors 2012-07-06 14:32:35 +00:00
vAugagneur
5633503912 //fixed #PSCFV-2432 part 3 for IE :p 2012-05-21 17:15:51 +00:00
vAugagneur
13edc7b5d0 //fixed #PSCFV-2432 part 3 for IE :p 2012-05-21 17:15:51 +00:00
vAugagneur
192c1d7453 //fixed #PSCFV-2432 part 2 for IE 2012-05-21 17:07:51 +00:00
vAugagneur
7646d3e5d6 //fixed #PSCFV-2432 part 2 for IE 2012-05-21 17:07:51 +00:00
vAugagneur
52d0c9662f //fixed #PSCFV-2432 2012-05-21 17:01:22 +00:00
vAugagneur
817caf40c0 //fixed #PSCFV-2432 2012-05-21 17:01:22 +00:00
tDidierjean
6bf7fa6908 [*] BO : #PI-123 - toolbar and page title refactoring 2012-04-12 08:34:38 +00:00