dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,169 Commits 9 Branches 19 Tags
4fbc8deaa87f13bef2753f4cb64bede161e06d21
Commit Graph

610 Commits

Author SHA1 Message Date
Kevin Granger 9c4ee27f20 // mobile nav WIP 2013-11-07 21:48:55 +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
Kevin Granger 866e7f831b // fixs highlight search 2013-11-06 19:26:22 +01:00
Jerome Nadaud 616cc91eb2 // Fix bug JQuery on handler 2013-11-06 15:49:44 +01:00
Jerome Nadaud 56230a1f53 // Live is deprecated in jquery 1.9 2013-11-06 15:34:46 +01:00
Jerome Nadaud fcb225ac5a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-06 12:19:15 +01:00
Jerome Nadaud 0c1b77b3da // Fix Combinations list actions button problem 2013-11-06 12:18:52 +01:00
Kevin Granger 05c71145c2 // dashboard 2013-11-06 12:14:49 +01:00
Damien Metzger ad7dfca9e1 // RSS date on the dashboard 2013-11-05 16:55:55 +01:00
Rémi Gaillard 161145fb34 // small fix 2013-11-05 15:35:14 +01:00
Rémi Gaillard a5bb0486e6 // fix email validator && allow to convert unicode without classes 2013-11-05 15:06:22 +01:00
Vincent Augagneur e710942833 //small fix on dashboard config save 2013-11-05 10:22:22 +01:00
Damien Metzger 8dc29b20f0 // Code cleaning and dashgoals improvements (part 1 - not finished yet) 2013-11-04 18:52:27 +01:00
Vincent Augagneur 5386a4547b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:57:50 +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
Vincent Augagneur d571920806 //small fix 2013-11-04 11:09:53 +01:00
Rémi Gaillard 930c9f3ff5 // validators 2013-11-02 10:50:02 +01:00
Rémi Gaillard 8a7f869515 // small graphical bug 2013-10-31 10:41:15 +01:00
Vincent Augagneur 6a3e711cff //small fix 2013-10-30 15:43:31 +01:00
Vincent Augagneur ad68105467 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-30 10:52:04 +01:00
Vincent Augagneur 0020412aea //added Preactivation request on dashboard 2013-10-30 10:51:58 +01:00
Kevin Granger 5fa36abcaf // fixs UI 2013-10-29 17:32:57 +01:00
Jerome Nadaud 48b7a49b1a // Product image upload failed with bad content-type header 2013-10-28 14:58:19 +01:00
Gregory Roussac 9a879bc133 Merge pull request #897 from freedayko/development 
[*] BO : improved unicode characters replacement in URLs
 2013-10-28 03:09:16 -07:00
gRoussac 2dbaa5f73b [-] BO : Fix bug #10689, could not set image legend in back office 2013-10-27 22:49:25 +01:00
Aleksander Palyan ee06d3114d [*] BO : improved unicode characters replacement in URLs (Russian and Ukrainian characters added) 2013-10-27 15:05:49 +02:00
Kevin Granger 339f428c23 // fix login - (tabindex, loading, ellipsis) 2013-10-25 14:58:10 +02:00
Rémi Gaillard 59a1105fce // small fix on multishop checkboxes 2013-10-25 14:55:27 +02:00
Jerome Nadaud 6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
Rémi Gaillard 2279b959fe // small changes on orders view 2013-10-23 12:10:02 +02:00
Rémi Gaillard 8662ef12b4 // small changes on orders view 2013-10-23 11:59:28 +02:00
Jerome Nadaud 45ea4aefad // Fix Combinations ajax problem 2013-10-23 10:50:18 +02:00
Vincent Augagneur c61cec9f2a //display date on dashproducts && added param date_from & date_to on dashboard hooks 2013-10-23 09:59:16 +02:00
Damien Metzger a2be0364da // First draft goals 2013-10-22 19:59:18 +02:00
Jerome Nadaud b6d6336e26 // Add date subtitle 2013-10-22 12:12:41 +02:00
Kevin Granger 3ae1f68b3b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 18:03:15 +02:00
Kevin Granger 2e13013657 // search field WIP 2013-10-21 18:03:00 +02:00
Jerome Nadaud f0104dc726 // Wait 1s for ajax element close 2013-10-21 17:22:42 +02:00
Jerome Nadaud 101df4c0b9 // Add check list filters value 2013-10-21 12:35:57 +02:00
Kevin Granger 5f52a9e171 // fix products 2013-10-18 18:38:02 +02:00
Rémi Gaillard 2e65214c39 // manually merge of modules search 2013-10-16 11:36:40 +02:00
Damien Metzger 7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +02:00
Damien Metzger 55fad19954 // Updated dashactivity 2013-10-15 11:18:30 +02:00
Kevin Granger 2bc927c810 // login css 2013-10-14 18:08:33 +02:00
Kevin Granger 3f22a6b6c9 // login flip 2013-10-14 16:34:02 +02:00
Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
djfm 5e407db21e [*] LO : Fixed a few bugs with currency formats in Back-Office orders 2013-10-14 09:30:45 +00:00
Kevin Granger 59435fa2ee // login flip WIP 2013-10-14 09:57:02 +02:00
Kevin Granger 89251a667b // feedback button 2013-10-11 18:26:12 +02:00