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
Damien Metzger f29c2d3fcb // Added some figures to the dashboard 2013-09-03 18:00:34 +02:00
gRoussac 5d8e187faa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-03 17:43:51 +02:00
gRoussac 0891c986d6 // fix from comment https://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92ahttps://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92a#commitcomment-4002919 2013-09-03 17:43:33 +02:00
Gregory Roussac 8fedbe189c Merge pull request #682 from MyBB-Services/dev/sa/ordercartrulecleanup 
[*] Project : Orders should rely only on ps_order_cart_rule
 2013-09-03 06:41:06 -07:00
Jerome Nadaud 7d61be252f [+] BO : Get categories in nested array 2013-09-03 15:27:58 +02:00
Kevin Granger 5f5997b567 // fix quick access -> target _blank for frontend 2013-09-03 15:19:34 +02:00
Vincent Augagneur b840f28137 //oups 2013-09-03 15:13:05 +02:00
soufyan cd7d604b75 [*] Project : Orders should rely only on ps_order_cart_rule 2013-09-03 15:10:06 +02:00
Gregory Roussac 5caae97813 Merge pull request #680 from djfm/development 
// fixed unstranslatable string in AdminSupplyOrdersController
 2013-09-03 06:00:50 -07:00
Kevin Granger dca6e39feb // css for tree view 2013-09-03 14:52:50 +02:00
djfm 572a2e45aa // fixed unstranslatable string in AdminSupplyOrdersController 2013-09-03 12:51:21 +00:00
gRoussac 98f60d039b // fix warning 2013-09-03 12:29:17 +02:00
Kevin Granger 2990497a26 // header notifications 2013-09-03 12:25:48 +02:00
Damien Metzger a900edee68 // Data, data, data 2013-09-03 11:05:24 +02:00
Vincent Augagneur 70e6aea7c3 //typo 2013-09-03 10:59:12 +02:00
Vincent Augagneur 5dc2eec97d //added tab content in dashproduct module 2013-09-03 10:38:43 +02:00
Damien Metzger 61d10abc76 // Use date_from and date_to in dashboard stats 2013-09-03 10:34:21 +02:00
Vincent Augagneur 7b902ac99d //added param date_from & date_to on hookDashboardDatas 2013-09-03 10:30:08 +02:00
Vincent Augagneur 4d3b378965 //added form date range picker on dashboard 2013-09-03 10:19:15 +02:00
Gregory Roussac 656717fb4c Merge pull request #679 from kluevandrew/patch-3 
[*] BO : Cursor "pointer" for .button class
 2013-09-03 00:51:38 -07:00
Gregory Roussac e08c8b2d25 Merge pull request #674 from PrestaEdit/patch-50 
[*] BO: sort modules name in Stats
 2013-09-03 00:49:11 -07:00
Andrew 97f1db480a BO: Cursor "pointer" for .button 
Cursor "pointer" for each button in back office
 2013-09-03 11:35:50 +04:00
Damien Metzger 19fc22fbf0 // Added translations directory to module gapi 2013-09-02 20:34:43 +02:00
Damien Metzger 1fc507d8d2 // Added configuration checks to the Google Analytics modules 
// Implemented the first real data in the dashboard
 2013-09-02 20:18:51 +02:00
Jerome Nadaud c3772fb355 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-02 19:11:17 +02:00
Jerome Nadaud da12fbdd5e [-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes 2013-09-02 19:09:47 +02:00
Kevin Granger 268183f4d2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-02 19:05:55 +02:00
Kevin Granger 2f5054cb92 // fix anime dashboard loading 2013-09-02 19:05:34 +02:00
Damien Metzger 63a9fd0236 [*] MO : Added help in the Google Analytics API module 2013-09-02 18:54:39 +02:00
gRoussac 94bdde4630 [-] CORE : Remove PHP Warning: file_put_contents on modules config.xml 2013-09-02 18:19:21 +02:00
Gregory Roussac abf5ad195c Merge pull request #676 from dlage/patch-1 
[*] MO : blocknewproducts avoid $newProducts not defined
 2013-09-02 08:58:32 -07:00
Vincent Augagneur 11cd88cf63 //data bind dashtrends module 2013-09-02 17:25:33 +02:00
Vincent Augagneur 9265676f0d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-02 17:23:00 +02:00
Vincent Augagneur f165dae15d //now you can refresh each dashboard module you want 2013-09-02 17:22:51 +02:00
Gregory Roussac b2ccf88296 Merge pull request #663 from sjousse/patch-1 
[-] MO : Shopimporter file_exists does not exists in Validate Class
 2013-09-02 08:21:42 -07:00
Gregory Roussac f7eb6b3a16 Merge pull request #665 from Ha99y/Get-Combination-Images 
[*] CLASSES : Add $id_product_attribute param to Image::getImages
 2013-09-02 08:11:48 -07:00
Damien Metzger 48d7bc890a // Fixed warning in AdminModulesController (variable conflict) 2013-09-02 17:11:41 +02:00
Rémi Gaillard 6059b4301a // states list 2013-09-02 17:10:20 +02:00
Damien Metzger c1cdc90343 [+] MO : new module Gapi for Google Analytics API 2013-09-02 17:07:19 +02:00
Kevin Granger 121554026c // adjustments on modules dash 2013-09-02 16:41:48 +02:00
gRoussac 36d9e0eed5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-02 16:28:56 +02:00
gRoussac c6d2e1252e [-] INSTALLER : Fix fatal error in upgrade, could not load configuration class 2013-09-02 16:28:38 +02:00
Kevin Granger af3051ca8f // BO Dashboard : animate transition 2013-09-02 16:09:27 +02:00
Vincent Augagneur 81c47a085e //fix remove class loading 2013-09-02 15:41:28 +02:00
Kevin Granger 399f60b900 // BO Dashboard loading et trends 2013-09-02 15:17:05 +02:00
Vincent Augagneur f778b0da25 //remove class loading after widget filling 2013-09-02 15:09:27 +02:00
Gregory Roussac fe209e0c55 Merge pull request #678 from gr4devel/patch-5 
[*] BO : add TinyMCE editor for supplier descrpition in AdminSuppliers
 2013-09-02 06:03:20 -07:00
Vincent Augagneur 0cf96cd059 //small fix 2013-09-02 14:58:17 +02:00
Vincent Augagneur d10a339542 //kevin special commit 2013-09-02 14:47:47 +02:00
gr4devel f535d60a29 [-] fix typo in adding TinyMCE editor for supplier descrpition in AdminSuppliersController 2013-09-02 14:24:18 +02:00