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

1840 Commits

Author SHA1 Message Date
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 c4d18e5e9f avatar on customer threads 2013-11-02 16:01:06 +01:00
Kevin Granger ba28c5f527 // UI fixs 2013-10-31 15:49:57 +01:00
Kevin Granger 534421fb6b // UI fixs 2013-10-31 12:20:29 +01:00
Kevin Granger 4334364b36 // cart rules > conditions > product rules 2013-10-31 11:34:47 +01:00
Rémi Gaillard d17515a728 // don't format currency on input 2013-10-31 10:22:38 +01:00
Kevin Granger 09dcff959e // cart rules > conditions > product rules WIP 2013-10-30 19:25:58 +01:00
gRoussac 8547f663d1 [-] BO : AdminImport withdraw separator changed in js 2013-10-30 18:46:02 +01:00
Rémi Gaillard ecf45d0475 // small fix 2013-10-30 18:28:55 +01:00
Jerome Nadaud 9f2424db41 // Fix Module exception in transplant 2013-10-30 18:11:33 +01:00
Kevin Granger 0b564c0107 // oups 2013-10-29 18:15:17 +01:00
Kevin Granger aee725839e // fixs btn-group 2013-10-29 18:10:07 +01:00
Kevin Granger 5fa36abcaf // fixs UI 2013-10-29 17:32:57 +01:00
gRoussac 75cde08776 // update conf message in AdminImport 2013-10-29 16:16:55 +01:00
Jerome Nadaud b605f33359 [-] BO : FixBug #PSCFV-10866 - Tagify system not working 2013-10-29 12:07:30 +01:00
Jerome Nadaud 580e201c48 [-] BO : FixBug #PSCFV-9319 - display only valid order id 2013-10-29 11:38:48 +01:00
Kevin Granger b3d7b8754b // fixs date range picker Wip 2013-10-29 10:40:33 +01:00
gRoussac 0aca1d4a67 [*] BO : AdminProducts find smallest images 2013-10-29 08:47:41 +01:00
Jerome Nadaud dd10301413 // Fix tagify key events 2013-10-28 17:46:00 +01:00
Jerome Nadaud a466c6f5f7 // Add tagify system to product information 2013-10-28 16:32:17 +01:00
Kevin Granger 3798adff2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-28 16:19:02 +01:00
Kevin Granger d523d739e7 // dashboard date range picker wip 2013-10-28 16:18:43 +01:00
Damien Metzger 08732eda50 // Fixed default selection in the stats submenu 2013-10-28 12:08:46 +01:00
gRoussac 4103339f53 [-] BO : AdminImport, fix bug from https://github.com/indesign47/PrestaShop/commit/84454bbc1c7a315e232245c5e43b300b8f153473#commitcomment-4418502 2013-10-28 11:21:25 +01:00
gRoussac 2dbaa5f73b [-] BO : Fix bug #10689, could not set image legend in back office 2013-10-27 22:49:25 +01:00
Kevin Granger 50bc046671 // fix panel header tree actions (search + button) 2013-10-25 17:24:49 +02:00
Rémi Gaillard 180b180aee // small changes 2013-10-25 16:24:57 +02:00
Damien Metzger aa322e4777 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-10-25 15:22:01 +02:00
Damien Metzger e8d5dc8a62 [*] BO : search results improvements (no unaccessible tabs, better display, better information) 2013-10-25 15:19:03 +02:00
Kevin Granger 339f428c23 // fix login - (tabindex, loading, ellipsis) 2013-10-25 14:58:10 +02:00
Jerome Nadaud 8d1765f2df Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	controllers/admin/AdminCategoriesController.php
 2013-10-25 14:29:02 +02:00
Jerome Nadaud bff1ad8833 // Some changes to integrate uploader helper 2013-10-25 14:20:42 +02:00
Damien Metzger 087d0d8206 // Fields resizing 2013-10-25 11:25:13 +02:00
Damien Metzger 0ca5a24e84 // Added field (bootstrap) size in helper form 2013-10-25 10:16:39 +02:00
Damien Metzger cd5fa81025 // Fixed boulette 2013-10-24 19:29:22 +02:00
Damien Metzger 4cb7bd9137 // Changed label 2013-10-24 19:19:20 +02:00
Damien Metzger 8748b0d240 // Small improvements 2013-10-24 19:12:50 +02:00
Jerome Nadaud 6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
gRoussac 759fe2f671 // norms 2013-10-24 18:09:21 +02:00
Gregory Roussac 0416aca547 Merge pull request #889 from PhpMadman/PSCFV-10728 
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
 2013-10-24 09:06:43 -07:00
PhpMadman c516035e0e [-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO 2013-10-24 17:19:28 +02:00
Damien Metzger df639337af // Code cleaning and small fixes 2013-10-24 17:04:55 +02:00
Damien Metzger d2ff076eb1 // Removed useless alert 2013-10-24 16:43:41 +02:00
indesign47 84454bbc1c [*] BO : AdminImport add img manufacturers-suppliers 2013-10-24 16:16:29 +02:00
Rémi Gaillard 691e45a168 // delete useless file 2013-10-24 15:23:03 +02:00
Rémi Gaillard 971722a13f // note updated by ajax in admincustomers should be url encoded 2013-10-24 11:56:50 +02:00
Rémi Gaillard 4bfd8dee11 // note updated by ajax in admincustomers should be url encoded 2013-10-24 11:51:48 +02:00
Kevin Granger 7a8cdf3913 // admin create order WIP 2013-10-23 18:54:44 +02:00
Jerome Nadaud 16dfea95e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-23 16:49:05 +02:00
Jerome Nadaud a27f8bc999 // Fix Stats datepicker 2013-10-23 16:48:55 +02:00