dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph
20926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 8f9fc10221 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-16 11:45:31 +02:00
gRoussac 62aaf16d60 [*] FO : New hooks for home tabs 2013-10-16 11:44:55 +02:00
Damien Metzger a51f41ca09 // Fixed dashboard best sellers 2013-10-16 11:42:42 +02:00
Rémi Gaillard 2e65214c39 // manually merge of modules search 2013-10-16 11:36:40 +02:00
Kevin Granger 486e6c1b66 // datepicker 2013-10-16 10:55:47 +02:00
Rémi Gaillard 22fd1b84c4 Merge pull request #847 from MustangZhong/patch-1 
[-] WS: Missing field on Cart::getWsCartRows()
 2013-10-16 00:58:16 -07:00
Damien Metzger 04999f7624 // Small fixes 2013-10-16 09:43:38 +02:00
Jerome Nadaud 476bf72bcc // Ooops 2013-10-16 09:21:49 +02:00
MustangZhong ad27dbe8d1 Update Cart.php 
The field "id_address_delivery" is missing in getWsCartRows.
Since id_address_delivery is required in the web service field definition.
 2013-10-16 10:14:14 +08:00
Kevin Granger be2ea4ca77 // login 2013-10-15 20:04:19 +02:00
Rémi Gaillard 6ee538c710 // fix on ps_cleaner 2013-10-15 19:53:59 +02:00
Jerome Nadaud dcbe3cb8e8 // Small datapicker fix 2013-10-15 19:16:23 +02:00
Jerome Nadaud 3aa6976e31 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 19:14:51 +02:00
Jerome Nadaud 04e760512f // Fix month overlapping on datapicker 2013-10-15 19:14:45 +02:00
Rémi Gaillard 1b8526cd05 // fix ajax on module list 2013-10-15 18:35:04 +02:00
Kevin Granger 8dce01e633 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 18:20:40 +02:00
Jerome Nadaud aefd5947d2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 18:12:28 +02:00
Jerome Nadaud ed2e9bee70 // Small datepicker fix 2013-10-15 18:12:01 +02:00
Kevin Granger 0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +02:00
Damien Metzger 953f4c4686 // Fixed login social links 2013-10-15 18:08:57 +02:00
Jerome Nadaud a85c1d7933 // Add index.php files to dashboard folder 2013-10-15 18:05:02 +02:00
Jerome Nadaud 2157311f11 // Some improvement for range datepicker 2013-10-15 18:04:28 +02:00
gRoussac 237b950eb6 [-] FO : #PSCFV-10640 again, bad assignement 2013-10-15 16:35:58 +02:00
Jerome Nadaud 6c6c3b240e // Fix bug display final price when country have no display tax 2013-10-15 15:06:38 +02:00
gRoussac 7ae9832992 // small cast 2013-10-15 14:56:25 +02:00
gRoussac 81497be5ab [-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC 2013-10-15 14:53:44 +02:00
Jerome Nadaud 5fd6b9aac6 // Add overflow-y to module payments 2013-10-15 14:53:31 +02:00
Damien Metzger eed6b65914 // Added Addons block in the dashboard 2013-10-15 14:18:50 +02:00
Damien Metzger 7759bfaa66 // Typo 2013-10-15 14:00:37 +02:00
Damien Metzger 7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +02:00
Kevin Granger d19b0ed8e0 // icon for error notice 2013-10-15 12:31:17 +02:00
Kevin Granger d23714e9e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 12:11:15 +02:00
Kevin Granger d1bc5eb6e0 // calendar WIP 2013-10-15 12:10:05 +02:00
Damien Metzger 55fad19954 // Updated dashactivity 2013-10-15 11:18:30 +02:00
Rémi Gaillard 837ca34e7e [-] Core: Product::getPriceStatic called with 1 quantity return the specific price for 1 qty if called with id_cart = 0 2013-10-15 10:30:48 +02:00
gRoussac 9c861642a5 [-] BO : AdminImport, wrong default separators 2013-10-15 10:09:16 +02:00
Gregory Roussac dec9ef40a8 Merge pull request #841 from indesign47/patch-10 
[+] BO : AdminImport add entity Alias
 2013-10-15 01:03:33 -07:00
Vincent Augagneur bd95d03e37 //blockwishlist now use boostrap design 2013-10-15 09:30:26 +02:00
djfm b4e18954f9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-15 07:22:03 +00:00
Francois Gaillard fd2dc4ff64 [-] Classes : Modules listing and case insensitive 2013-10-15 09:14:49 +02:00
indesign47 f25a418785 Update Alias.php 2013-10-14 19:20:38 +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
Kevin Granger 2bc927c810 // login css 2013-10-14 18:08:33 +02:00
Gregory Roussac 2a28e47650 Merge pull request #799 from Lupul/development 
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency
 2013-10-14 08:37:28 -07: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
Jerome Nadaud 07073afa1f // Fix CMS filter, reset and sort 2013-10-14 17:28:21 +02:00
Gregory Roussac f3755e2d0a Merge pull request #843 from ldecoker/patch-10 
[-] BO : AdminMeta - make sure module and controller name are in lowercase
 2013-10-14 07:46:56 -07:00
Gregory Roussac bce6e8f09f Merge pull request #837 from axometeam/patch-21 
[-] BO : bad query when filtering on status + sorting by quantity in the AdminProducts getList
 2013-10-14 07:45:52 -07:00