dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,344 Commits 9 Branches 19 Tags
2e16a1e5d4ef148d162edaaa0d3d1ae53bc7a2ca
Commit Graph
5434 Commits
Author SHA1 Message Date
gRoussac 0aca1d4a67 [*] BO : AdminProducts find smallest images 2013-10-29 08:47:41 +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
Jerome Nadaud 5760718b85 // Add Save button to page header toolbar 2013-10-28 15:55:58 +01:00
Damien Metzger 08732eda50 // Fixed default selection in the stats submenu 2013-10-28 12:08:46 +01:00
Damien Metzger b6799d4f2f [*] BO : download attachments directly from the list 2013-10-28 11:57:40 +01:00
gRoussac 2dbaa5f73b [-] BO : Fix bug #10689, could not set image legend in back office 2013-10-27 22:49:25 +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
Rémi Gaillard 8b1f9d0560 // small changes on admincms 2013-10-25 18:42:54 +02:00
Damien Metzger e9a802cf23 [*] BO : Added the number of associated products in the product attachments list 2013-10-25 18:04:27 +02:00
gRoussac 025b62f995 // norms 2013-10-25 17:33:44 +02:00
Rémi Gaillard 5ac471deaf // product toolbar 2013-10-25 16:11:33 +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
Jerome Nadaud 81482df1e5 // Fix merge 2013-10-25 14:33:29 +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
Rémi Gaillard 3997543e7f // notice 2013-10-25 11:35:01 +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
gRoussac a9643c80c3 // bad commit sorry 2013-10-24 22:45:43 +02:00
gRoussac 438a3dda2b [-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update 2013-10-24 22:42:13 +02:00
Damien Metzger cd5fa81025 // Fixed boulette 2013-10-24 19:29:22 +02:00
Jerome Nadaud ea7b8b175e // Fix list title 2013-10-24 17:18:14 +02:00
Damien Metzger df639337af // Code cleaning and small fixes 2013-10-24 17:04:55 +02:00
Damien Metzger 2931c20914 // Fixed rounding 2013-10-24 16:38:48 +02:00
indesign47 ea8a5277f2 [*] BO : AdminImport add img manufacturers-suppliers 2013-10-24 15:44:11 +02:00
Damien Metzger a1df97776a // Set default values 2013-10-24 13:54:55 +02:00
emilien-puget 92c2f6953f changed path from dirname(__FILE__) to PS_ROOT_DIR 2013-10-24 11:44:52 +02:00
Rémi Gaillard 9a7c3dd88f // small fix 2013-10-24 10:14:44 +02:00
gRoussac 56693da6e0 // remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702 2013-10-23 19:02:13 +02:00
Kevin Granger 7a8cdf3913 // admin create order WIP 2013-10-23 18:54:44 +02:00
gRoussac 3e33a259ef [-] BO : FIx bug #PSCFV-10736 again, fixing query when product is not in base 2013-10-23 18:33:37 +02:00
Rémi Gaillard e1887425fa [*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import 2013-10-23 18:22:53 +02:00
gRoussac 8e506ddff2 [-] BO : FIx bug #PSCFV-10736, could not load a product given from getBoughtProducts 2013-10-23 18:16:45 +02:00
gRoussac 03ad842697 [-] BO : Fix bug #PSCFV-10790, Customer group names not exploded 2013-10-23 16:07:28 +02:00
Damien Metzger 9930c375c7 // Dashgoals :) 2013-10-23 15:37:43 +02:00
Rémi Gaillard 554ab9414f [-] BO: product listing should call Product::getPriceStatic() with the product default shop in the context when it is not a shop context 2013-10-23 15:08:02 +02:00
Rémi Gaillard 747ec9a2c4 // notice on carrierwizard when step back 2013-10-23 14:50:30 +02:00
Rémi Gaillard be1299d8d7 // small fix 2013-10-23 14:19:19 +02:00
Kevin Granger 5ee716ff9e // fix admin edit countries 2013-10-23 11:18:31 +02:00
Jerome Nadaud 45ea4aefad // Fix Combinations ajax problem 2013-10-23 10:50:18 +02:00
Rémi Gaillard 6cddb57ce3 [-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724 2013-10-23 10:34:00 +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
gRoussac ae63336a37 [-] BO : Fix bug #PSCFV-10638, Admin Import by reference moves products to home category 2013-10-23 01:41:05 +02:00
gRoussac 5d28d38a22 [-] BO : Fix bug #PSCFV-7907 AdminImport, add custom field to features 2013-10-23 01:18:09 +02:00
Gregory Roussac 5bb4d48ddd Merge pull request #870 from djfm/development 
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
 2013-10-22 10:17:11 -07:00
Jerome Nadaud 67fc91e2c9 // Categories thumbnails 2013-10-22 17:43:10 +02:00