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

6495 Commits

Author SHA1 Message Date
Jerome Nadaud b51b388eaa // Blockcategories thumnail uploader fix 2013-11-07 16:44:55 +01:00
Kevin Granger 63e31a4585 Merge pull request #939 from djfm/bootstrap 
Translations (EN) / Mails / Fix Column
 2013-11-07 05:08:16 -08:00
djfm 598034efb4 // English 2013-11-07 12:27:48 +00:00
gRoussac 91cde1ab3a [-] BO : getCMSPages to associated shop in cmscontroller 2013-11-07 12:09:58 +01:00
Vincent Augagneur 9e76f82fb5 //merge 2013-11-07 12:06:58 +01:00
Vincent Augagneur 3c31f1a07f //dashconfig errors return 2013-11-07 12:05:03 +01:00
gRoussac fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
djfm 3d22303b90 // sprintf 2013-11-07 10:01:10 +00:00
Jerome Nadaud 7895f8643e // Fix missing page header in combinations generator 2013-11-06 14:42:56 +01:00
PhpMadman d95885caae [*] FO : Added posibilty to display new price instead of quantity discount 2013-11-06 14:41:42 +01:00
Jerome Nadaud 0c1b77b3da // Fix Combinations list actions button problem 2013-11-06 12:18:52 +01:00
Vincent Augagneur a890410a64 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-06 10:57:02 +01:00
Vincent Augagneur c16c239953 //typo 2013-11-06 10:56:56 +01:00
Jérôme Nadaud 54db0b705c Merge pull request #923 from PrestaEdit/1.6.x-fancybox 
//remove unnecessary addCSS (fancybox)
 2013-11-06 00:31:57 -08:00
Damien Metzger a31dbeb68e // Fixed bootstrap mode for modules 2013-11-05 17:29:51 +01:00
Kevin Granger b68d8c5d4a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 17:15:51 +01:00
Kevin Granger 332101614a // moved nv.d3.css to vendor directory 2013-11-05 17:15:36 +01:00
Vincent Augagneur 3f3a4ef342 //revert 2013-11-05 16:58:26 +01:00
Vincent Augagneur 217a9124d4 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:56:08 +01:00
Vincent Augagneur 1dccee0036 //remove back button in header toolbar on carrier wizard 2013-11-05 16:56:03 +01:00
Damien Metzger ad7dfca9e1 // RSS date on the dashboard 2013-11-05 16:55:55 +01:00
Damien Metzger ec528fff93 // one more groups improvement 2013-11-05 16:34:03 +01:00
Damien Metzger 161c701ecf // Groups review 2013-11-05 16:30:34 +01:00
Damien Metzger e4fe5f6df6 // Fixed htmlentities in KPIs 2013-11-05 16:01:48 +01:00
fram 4b0b5cf4da // added an option not to override the local localization pack when installing a localization pack 2013-11-05 12:08:14 +01:00
gRoussac 581645ce6d [-) BO : Action is mandatory for a cart rule 2013-11-05 11:26:10 +01:00
Vincent Augagneur 9af3b30135 //smal fix on hookDashboardData params 2013-11-05 10:21:34 +01:00
Jonathan Danse 9f396ada83 //remove unnecessary addCSS (fancybox) 2013-11-05 10:13:13 +01:00
Jerome Nadaud de8bd97831 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 19:50:48 +01:00
Kevin Granger fbc93e5632 // moved admin css and backward compatibility css to admin theme css directory 2013-11-04 19:48:53 +01:00
Damien Metzger 8dc29b20f0 // Code cleaning and dashgoals improvements (part 1 - not finished yet) 2013-11-04 18:52:27 +01:00
Jerome Nadaud fa68e015b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 18:34:51 +01:00
Jerome Nadaud bf2d54e286 // Add new uploader helper to blockcategories 2013-11-04 18:32:59 +01:00
Kevin Granger 8aedd4eb04 // Cleaned CSS files 2013-11-04 18:31:59 +01:00
Jerome Nadaud 12276f41fb // Update image when updated 2013-11-04 18:26:24 +01:00
gRoussac be13f82b30 [*] FO: Follow up https://github.com/PrestaShop/PrestaShop/commit/e86c56172dad2892d5c7e7dbb0908b0f4ffbaae0 2013-11-04 18:20:01 +01:00
Damien Metzger 0009556ed5 // Fixed no bootstrap for modules 2013-11-04 16:51:30 +01:00
Damien Metzger 695326bc4e // Filter search BO 2013-11-04 16:51:30 +01:00
Kevin Granger d0c6d86eb9 // fixs for merge 2013-11-04 15:56:24 +01:00
Damien Metzger 27273334e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:47:16 +01:00
Damien Metzger e7e4376307 // Changed "gender image" to social title in the customer (BO) 2013-11-04 14:45:36 +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
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 0451ca5c73 // Added Addons search 2013-11-04 12:24:55 +01:00
Damien Metzger cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
Rémi Gaillard d49c4cf62e [-] BO: Fix from name when replying to customer threads 2013-11-04 09:38:12 +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