dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph
20926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger e7e4376307 // Changed "gender image" to social title in the customer (BO) 2013-11-04 14:45:36 +01:00
Kevin Granger 92bd59fbea Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:43:10 +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
Damien Metzger f8256bc15d // Fixed module KPI 2013-11-04 14:39:53 +01:00
gRoussac 3f817e8729 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 14:31:29 +01:00
gRoussac 66f314bbb2 // missing trailing bracket in modules/productcomments/config.xml 2013-11-04 14:31:15 +01:00
Damien Metzger d93ea846a9 // Code cleaning and small fixes 2013-11-04 14:29:31 +01:00
Rémi Gaillard bf8cd29868 // validator on message field 2013-11-04 14:21:42 +01:00
Damien Metzger 178cd7362d // admin search code cleaning 2013-11-04 13:57:27 +01:00
Damien Metzger 0451ca5c73 // Added Addons search 2013-11-04 12:24:55 +01:00
gRoussac b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
gRoussac 9ea79f8cb5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 11:48:25 +01:00
Rémi Gaillard b3c54a59dd // typo 2013-11-04 11:48:30 +01:00
Rémi Gaillard 06d73554be // preg instead strpos 2013-11-04 11:39:48 +01:00
gRoussac 96a6a24a14 // move to 1.5.6.1 Installer 2013-11-04 11:11:21 +01:00
gRoussac ad555f1d30 [-] IN : Follow up #PSCFV-10671 update messages in base and https://github.com/PrestaShop/PrestaShop/commit/b16e4b5a8ee6bdab13808f8ab473bda6c060c086 2013-11-04 11:10:40 +01:00
Vincent Augagneur d571920806 //small fix 2013-11-04 11:09:53 +01:00
Gregory Roussac 4b6ee72072 Merge pull request #894 from codeurWeb/patch-6 
[-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php
 2013-11-04 02:02:10 -08:00
Damien Metzger cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
Rémi Gaillard e000f8c627 // something is missing in the last commit 2013-11-04 11:00:21 +01:00
Vincent Augagneur 02367e5396 //missing file for blockwishlist module 2013-11-04 10:42:37 +01:00
Rémi Gaillard 6ef7f258ea // small fix 2013-11-04 10:34:58 +01:00
Jerome Nadaud 2be72f50d1 [-] FO : FixBug Categories description 2013-11-04 10:29:44 +01:00
Vincent Augagneur 3de663f9a1 //missing files for module followup 2013-11-04 10:20:17 +01:00
Vincent Augagneur e03a86ad05 //homeslider new use bootstrap design 2013-11-04 10:01:29 +01:00
Rémi Gaillard d49c4cf62e [-] BO: Fix from name when replying to customer threads 2013-11-04 09:38:12 +01:00
gRoussac c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities 2013-11-03 22:59:04 +01:00
gRoussac 2a3192d98c [-] IN : Refacto for update_customer_default_group bad logical 2013-11-03 14:55:25 +01:00
gRoussac b16e4b5a8e [-] IN : Lower memory usage in migrate_orders, fix update_order_messages loop 2013-11-03 01:49:16 +01:00
gRoussac 8f72282594 [-] IN : update_customer_default_group returning false 2013-11-02 21:51:13 +01:00
gRoussac a5bb4f0323 [-] IN: Fix [insert order detail 1] error while upgrading 2013-11-02 20:39:53 +01:00
Rémi Gaillard c4d18e5e9f avatar on customer threads 2013-11-02 16:01:06 +01:00
Rémi Gaillard 95b5036782 // addsharethis cache 2013-11-02 15:41:40 +01:00
Rémi Gaillard 930c9f3ff5 // validators 2013-11-02 10:50:02 +01:00
Rémi Gaillard 5db9c5cdd5 // small fix 2013-11-02 09:54:37 +01:00
Kevin Granger 84be298dc5 // some W3C fixs 2013-11-01 17:25:18 +01:00
Kevin Granger 1bcb8d5c82 // sass-bootstrap 3.0.1 update 2013-11-01 16:44:55 +01:00
Kevin Granger 9c499dc8a4 // Placeholder instead of label for list filter date 2013-11-01 16:28:21 +01:00
Kevin Granger bf781ed267 // horizontal nav 2013-11-01 15:50:33 +01:00
PrestaEdit d4075f1267 [-] FO: use 4 images in thumbnails, not 3 2013-10-31 23:06:19 +01:00
gRoussac 062fb90c2e [-] IN : Fix Unknown column 'module_name' in 'ps_webservice_account' during upgrade 2013-10-31 19:24:41 +01:00
Kevin Granger 87eb9bba26 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 19:13:53 +01:00
Kevin Granger 64598535bd // Avatar + Vertical Nav WIP 2013-10-31 19:13:34 +01:00
Jerome Nadaud 9193a29a44 [+] MO : Blockcart - Add error handler on ajax function 2013-10-31 19:02:43 +01:00
Jerome Nadaud 671062af07 // Add Disable overrides to debug mode 2013-10-31 18:41:56 +01:00
Rémi Gaillard a1696efe63 // small fix 2013-10-31 18:40:29 +01:00
Rémi Gaillard 74e92e364c // php warning 2013-10-31 18:26:09 +01:00
Damien Metzger 3669948547 // Revert to the previous lib with a trick 2013-10-31 17:53:34 +01:00
Damien Metzger 1ecc6e32ba // Try out new PEAR JSON encode 2013-10-31 17:45:02 +01:00
Damien Metzger 8670db2316 // Image sizes 2013-10-31 17:41:02 +01:00