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

5016 Commits

Author SHA1 Message Date
Jerome Nadaud be0592d5a2 // Some fix 2013-09-13 17:19:20 +02:00
Jerome Nadaud 74237ff694 // Some fix 2013-09-13 17:11:12 +02:00
Jerome Nadaud 5e2aa392da // Some fix 2013-09-13 15:40:51 +02:00
Jerome Nadaud 2bf17241bd // Fix associated categories tree header 2013-09-13 11:50:27 +02:00
Kevin Granger 968f2a45d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-13 11:41:26 +02:00
Kevin Granger c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Jerome Nadaud f20fa55308 // Fix filter by category checkbox 2013-09-13 09:49:07 +02:00
Jerome Nadaud 7d9f9a7bfc // Fix CMS missing Page header toolbar 2013-09-12 19:21:53 +02:00
Jerome Nadaud 3cf4dc76b5 // Fix missing localizations page header toolbar 2013-09-12 18:54:28 +02:00
Damien Metzger 06a178b8fe // Replaced screencast option by menu option 2013-09-12 18:24:18 +02:00
gRoussac db4b69d10c [-] BO : Customer message twice encoded 2013-09-12 18:03:30 +02:00
Jerome Nadaud 039955e6a1 // Fix bug customer list in multistore 2013-09-12 16:59:25 +02:00
Jerome Nadaud ba6699a378 // Fix Admin access 2013-09-12 15:55:14 +02:00
Jerome Nadaud c105486fa3 // Tree bugs 2013-09-12 15:22:47 +02:00
gRoussac 5095b45e47 [-] BO : Fix bug, orders states not ordered by order state name 2013-09-12 15:09:21 +02:00
Rémi Gaillard f9b1f0ab5e [*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists() 2013-09-12 15:03:23 +02:00
Jerome Nadaud e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Francois Gaillard 53c1e56c51 [-] BO : Bug fix - Encoding & tips of the day 2013-09-12 14:32:02 +02:00
gRoussac 90091d4f2c [-] BO : Do not copy link_rewrite from title if cms already has one 2013-09-12 10:50:04 +02:00
Vincent Augagneur 6fa398e8e0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-12 10:08:32 +02:00
Vincent Augagneur 38822bfb5e //dashactivity configuration 2013-09-12 10:08:28 +02:00
Jerome Nadaud e9dbadcabf // Tree 2013-09-11 20:41:14 +02:00
gRoussac dfdbe39ee3 [-] BO : Small changes when creating vouchers in back office orders 2013-09-11 16:28:11 +02:00
Rémi Gaillard c42d71b8f5 // oups 2013-09-11 16:06:23 +02:00
Rémi Gaillard 669c3791b5 [-] BO: Fix preview url with multishop 2013-09-11 15:55:25 +02:00
Jerome Nadaud 7909a7388c //Fix disabled categories with add parameter 2013-09-11 15:41:08 +02:00
Jerome Nadaud 49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
Jerome Nadaud e0d33eae9e // Categories Tree changes 2013-09-10 18:40:05 +02:00
Jerome Nadaud 7990db8b0c // Tree folders icon problem 2013-09-10 14:34:48 +02:00
Jerome Nadaud 85dc552667 // Toolbar 2013-09-10 14:08:29 +02:00
Vincent Augagneur b6e0583af8 //added security check on dashboard 2013-09-09 18:47:15 +02:00
Vincent Augagneur 4e1a513371 //added rss and useful link on dashboard 2013-09-09 18:44:34 +02:00
Jerome Nadaud 7bb295b076 // 2013-09-09 16:21:32 +02:00
gRoussac 54f7c65165 [-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_ 2013-09-09 12:20:38 +02:00
gRoussac 6b03af9ef9 [-] BO : ini_get('safe_mode') can return false 2013-09-08 22:26:21 +02:00
gRoussac ec556bb307 // remove Warning on array_map() 2013-09-08 20:01:55 +02:00
Jerome Nadaud f6355ff2d5 [-] BO : Change categories tree method 2013-09-06 17:09:32 +02:00
Francois Gaillard 768a8b36d5 [-] BO : AdminModulesController - Bug fix, $params was not set 2013-09-06 15:41:24 +02:00
Kevin Granger 1b2bab6943 // performance 2013-09-06 11:03:36 +02:00
Fabio Chelly 7e1c0d5a24 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-06 09:24:43 +02:00
Rémi Gaillard 8868271c07 // push changes 2013-09-05 18:37:25 +02:00
Vincent Augagneur 4124a48b1e //added check on range picker if date from is superior than date to 2013-09-05 16:34:03 +02:00
Rémi Gaillard 0f81518ba2 // Add a buton to erase all log 2013-09-05 15:58:36 +02:00
Vincent Augagneur c34dbcf43a //dashboard range date choice in ajax 👍 2013-09-05 15:25:41 +02:00
Sarah Lorenzini f09347a8be // update backup BDD, import, and email pages 2013-09-05 14:55:07 +02:00
Sarah Lorenzini 73524c7a4c // update maintenance and email pages 2013-09-05 14:16:06 +02:00
Rémi Gaillard 6e3d24b567 // add push 2013-09-04 19:33:05 +02:00
Kevin Granger 22d636f93a // Colored switch, removed "required field" legend, removed duplicate links quick access 2013-09-04 18:14:11 +02:00
Kevin Granger 671d419c27 // Carrier Wizard with bootstrap WIP 2013-09-03 19:36:04 +02:00
gRoussac 6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack 2013-09-03 18:20:58 +02:00