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

226 Commits

Author SHA1 Message Date
Jerome Nadaud
a569ab7e33 // Fix tree shop missing attributes 2013-12-06 18:11:06 +01:00
Damien Metzger
de456e45ec [*] Bo : removed empty filters from the cookie (thus limiting its size) 2013-12-03 11:44:51 +01:00
Jerome Nadaud
8bf49049eb // Prevent click event in tree toolbar buttons 2013-12-02 19:07:28 +01:00
Jerome Nadaud
e1568a67a2 // Fix products attachments uploader 2013-11-29 12:10:09 +01:00
Jerome Nadaud
b66f8ea75a // Allow list disabled categories 2013-11-28 14:49:41 +01:00
Jerome Nadaud
510b71054a // Add Drag and Drop to uploader helper 2013-11-28 09:55:22 +01:00
Jerome Nadaud
dc90bb6227 // Force clearstatcache on product image upload 2013-11-26 15:46:21 +01:00
Jerome Nadaud
48be09d82d // Missing Base uri in uploader helper 2013-11-25 17:37:26 +01:00
ccauw
eb312455e5 [-] BO : Double separator in function createTemplate() 
smarty->getTemplateDir() returns a result ending with a separator,
so no need to add DIRECTORY_SEPARATOR ?
 2013-11-25 14:19:21 +01:00
Jerome Nadaud
8d90578cf7 // Add anchor to list 2013-11-15 16:04:27 +01:00
Jerome Nadaud
80957666cf // Hide collapse and expand button when not necessary 2013-11-14 19:21:31 +01:00
Jerome Nadaud
18a2e026ef // Adding more buttons to module configuration 2013-11-14 15:49:17 +01:00
Jerome Nadaud
afaeb15b7d // Define default template dir on tree class 2013-11-13 20:10:13 +01:00
Jerome Nadaud
a3082be2db // Remove unnecessary function 2013-11-08 17:53:26 +01:00
Jerome Nadaud
217a79eeae // Unify thumb param in files options 2013-11-08 17:49:56 +01:00
Jerome Nadaud
ef469d7782 // Move spin and ladda js to products controller 2013-11-08 17:47:09 +01:00
Jerome Nadaud
5afe733e13 // Small fix on HelperUploader 2013-11-08 16:53:32 +01:00
Jerome Nadaud
01d8376ee7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 16:48:56 +01:00
Jerome Nadaud
18718792be // Uploader helper part 3 2013-11-07 16:42:00 +01:00
Jerome Nadaud
0c1b77b3da // Fix Combinations list actions button problem 2013-11-06 12:18:52 +01:00
Jerome Nadaud
cf44f8d0b4 // Uploader helper small fix 2013-11-04 19:50:04 +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
d78a268730 // Uploader helper part 2 2013-11-04 18:31:43 +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
39f6a2354a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	classes/helper/HelperForm.php
	classes/helper/HelperUploader.php
 2013-10-25 18:58:07 +02:00
Damien Metzger
03857c0576 [*] BO : you can know download the previous file near the upload file input 2013-10-25 18:55:25 +02:00
Jerome Nadaud
f89c8ed008 // Fix HelperUploader images params 2013-10-25 15:54:53 +02:00
Jerome Nadaud
52795495bd //Starting Uploader helper 2013-10-25 14:19:51 +02:00
Jerome Nadaud
73e9d966a6 // list bulk actions fix 2013-10-22 11:24:50 +02:00
Jerome Nadaud
5f75439a6b // Date range picker improvements 2013-10-21 17:07:57 +02:00
Vincent Augagneur
10473e09ad Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 14:51:25 +02:00
Vincent Augagneur
150c6e0130 [+] CORE : helperList action can be rendered from module classe 2013-10-21 14:51:14 +02:00
Jerome Nadaud
e53e63c257 // Add Back button to list footer 2013-10-21 13:45:39 +02:00
Jerome Nadaud
f9b115a2f8 // Date Range picker improvements 2013-10-17 11:39:02 +02:00
gRoussac
f1ea9ba5b4 [-] BO : Fix bug #PSCFV-10709 rename root category with slashes in it 2013-10-17 10:53:20 +02:00
Jerome Nadaud
a85b931765 // Adding compare options 2013-10-16 19:07:23 +02:00
Jerome Nadaud
6a7990869a // Range datepicker special compare actions 2013-10-16 18:26:00 +02:00
Jerome Nadaud
2157311f11 // Some improvement for range datepicker 2013-10-15 18:04:28 +02:00
Rémi Gaillard
6f4b85430c // Fix listings and sort 2013-10-14 18:52:48 +02:00
Jerome Nadaud
7d85b21e92 // Pagination fix 2013-10-14 18:22:55 +02:00
Jerome Nadaud
7e4329a4dc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-14 17:31:50 +02:00
Jerome Nadaud
7e9cdbb163 // Pagination fix 2013-10-14 17:30:56 +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
Jerome Nadaud
833091674c // Adding translations and PHP date format for datepicker 2013-10-14 11:34:04 +02:00
Jerome Nadaud
3282bd19e4 // Small fix 2013-10-14 10:59:20 +02:00
Jerome Nadaud
80c8605264 // Adding RTL to calendar helper 2013-10-14 09:14:18 +02:00
Jérôme Nadaud
892516342e // Fix when date is null 2013-10-13 11:47:29 +02:00
Jerome Nadaud
d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00
Jerome Nadaud
bedcacf0b4 // Starting development of data range picker 2013-10-11 16:12:40 +02:00
Jerome Nadaud
1a1f3de775 [-] BO: Fixbug #PSCFV-10671 - Double htmlentities. 2013-10-11 13:33:31 +02:00