dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,564 Commits 9 Branches 19 Tags
dabc3d359a12ee2a122e99224c8d158e220ffda7
Commit Graph
20564 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud de8bd97831 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 19:50:48 +01:00
Jerome Nadaud cf44f8d0b4 // Uploader helper small fix 2013-11-04 19:50:04 +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
Rémi Gaillard 569455a7ff // fix on front validators 2013-11-04 19:26:51 +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 d78a268730 // Uploader helper part 2 2013-11-04 18:31:43 +01:00
gRoussac 0e54bf0f76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 18:27:39 +01:00
Jerome NadaudandgRoussac 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
Rémi Gaillard f5cc6862cb // don't die on autoload 2013-11-04 18:08:24 +01:00
Damien Metzger 2a9ebaa6ed Merge pull request #920 from djfm/bootstrap 
// English emails
 2013-11-04 09:07:41 -08:00
djfm 71e3a8a937 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 16:58:17 +00:00
djfm 5372f31b4c // updated English emails 2013-11-04 16:57:50 +00:00
Jerome Nadaud b650c349d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 17:47:46 +01:00
Jerome Nadaud 5af2ef38a1 // Fix Tagify javascript error 2013-11-04 17:47:27 +01:00
Kevin Granger 9611c17980 // removed install.css http://www.youtube.com/watch?v=Y9mq7Qc4oSM 2013-11-04 17:28:50 +01:00
Rémi Gaillard 2c3a5c553d // small fix 2013-11-04 17:23:04 +01:00
Rémi Gaillard 0a65de5e5f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 17:22:21 +01:00
Rémi Gaillard f4740088c1 // small fix 2013-11-04 17:22:08 +01:00
Kevin Granger ddd722dc14 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 17:08:43 +01:00
Kevin Granger 667848d1df // removed csshover.htc 2013-11-04 17:08:32 +01:00
Damien Metzger ac1f142f23 // Moved default_language 2013-11-04 17:08:17 +01:00
Damien Metzger e8c0195ee9 // small fix merge 2013-11-04 17:04:09 +01:00
gRoussac c44b1d617c [-] BO : Could not change image position 2013-11-04 16:59:03 +01:00
Kevin Granger f3fa65f9be // removed admin-ie.css 2013-11-04 16:58:27 +01:00
Kevin Granger 68cda947ed // removed login.css 2013-11-04 16:53:43 +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
Damien Metzger 0ddc0d9f9a Merge pull request #919 from djfm/bootstrap 
// installer typography
 2013-11-04 07:23:25 -08:00
fram 5f1efc6b63 // installer typography 2013-11-04 16:20:10 +01:00
Damien Metzger d4a6148b64 // Anything but a 404 image 2013-11-04 16:09:55 +01:00
Kevin Granger 48025838df // fixs referrers 2013-11-04 16:08:38 +01:00
Kevin Granger d0c6d86eb9 // fixs for merge 2013-11-04 15:56:24 +01:00
gRoussac c452444620 [-] IN : Could not install when session_start() does not fail on ajax requests 2013-11-04 15:47:29 +01:00
Francois Gaillard a81cde11d6 [-] Classes : ProductSale - Merge fix 2013-11-04 15:35:59 +01:00
Damien Metzger f7d346ba99 // Added more results link at the end of the BO search 2013-11-04 15:03:48 +01:00
Damien Metzger 2e80ed8de5 // Cleaned conflict 2013-11-04 14:58:17 +01:00
Vincent Augagneur 5386a4547b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:57:50 +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 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