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

120 Commits

Author SHA1 Message Date
ccauw
eb312455e5 [-] BO : Double separator in function createTemplate() 
smarty->getTemplateDir() returns a result ending with a separator,
so no need to add DIRECTORY_SEPARATOR ?
 2013-11-25 14:19:21 +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
gRoussac
f1ea9ba5b4 [-] BO : Fix bug #PSCFV-10709 rename root category with slashes in it 2013-10-17 10:53:20 +02: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
Jerome Nadaud
3585bf33c8 // Fix supply order change state save button 2013-10-03 11:49:16 +02:00
Kevin Granger
f168dd7c50 // list icon backward compat 2013-10-02 17:38:53 +02:00
Jérôme Nadaud
f8ff755067 [+] BO : Product "For" 2013-07-25 14:50:10 +02:00
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
Kevin Granger
f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
Damien Metzger
47d343df90 // Fixed module positions in tabs 2013-07-04 09:33:43 +02:00
gRoussac
f93c7ec8c7 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
gRoussac
6e1f99f4b2 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +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
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
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
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
2a4cb58f5f // Opti 2012-08-23 16:16:16 +00:00
dMetzger
ab6ae48023 // Opti 2012-08-23 16:16:16 +00:00
dMetzger
fdc5adc415 [*] BO : Changed the default list view for products and categories when multistore is activated 2012-08-23 14:36:52 +00:00
dMetzger
bdc79aeb65 [*] BO : Changed the default list view for products and categories when multistore is activated 2012-08-23 14:36:52 +00:00
lLefevre
6db76c187e [-] TR : fix #PSCFV-3374 2012-07-27 14:14:07 +00:00
lLefevre
09aba262ab [-] TR : fix #PSCFV-3374 2012-07-27 14:14:07 +00:00
dMetzger
997a2ca01d [*] BO : Added an override capability for the admin templates 2012-07-09 14:12:37 +00:00
dMetzger
c6a1948341 [*] BO : Added an override capability for the admin templates 2012-07-09 14:12:37 +00:00
rMalie
187db96329 // Groups with only 1 shop are not disabled anymore in multishop toolbar 2012-05-21 16:52:07 +00:00
rMalie
c8941ad087 // Groups with only 1 shop are not disabled anymore in multishop toolbar 2012-05-21 16:52:07 +00:00
rMalie
d577b99ce3 // Improve Shop::getTotalShops() 2012-05-10 08:59:07 +00:00
rMalie
2933d699f4 // Improve Shop::getTotalShops() 2012-05-10 08:59:07 +00:00
rMalie
f5618698de // Rename treeview to treeview-categories 2012-05-03 08:10:10 +00:00
rMalie
39be1925b1 // Rename treeview to treeview-categories 2012-05-03 08:10:10 +00:00
rMalie
28fb76ba4a // Fix helper translations for shops #PSTEST-1121 2012-04-23 14:59:42 +00:00
rMalie
13cece04bc // Fix helper translations for shops #PSTEST-1121 2012-04-23 14:59:42 +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
tDidierjean
4a4baeef11 // Small fixes 2012-03-26 15:26:23 +00:00
tDidierjean
546c97251d // Small fixes 2012-03-26 15:26:23 +00:00
rMalie
62dda6b105 // Refacto generateShopList() 2012-03-15 09:33:23 +00:00
rMalie
ea67b720ec // Refacto generateShopList() 2012-03-15 09:33:23 +00:00
vChabot
1d6cb3afaa [-] BO : BugFix : #PSTEST-991 : ajax search with category treeview 2012-03-12 10:30:14 +00:00
vChabot
94fa94e572 [-] BO : BugFix : #PSTEST-991 : ajax search with category treeview 2012-03-12 10:30:14 +00:00
vChabot
4b2a5b2377 [-] BO : Bugfix : #PSFV-619 : removing the ability to add a new root category if you are not in multishop 
// category tree improved
 2012-03-05 16:52:58 +00:00
vChabot
c6461ed535 [-] BO : Bugfix : #PSFV-619 : removing the ability to add a new root category if you are not in multishop 
// category tree improved
 2012-03-05 16:52:58 +00:00