Commit Graph
18608 Commits
Author SHA1 Message Date
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
gr4devel 36ca7f294a [+] BO : add TinyMCE editor for supplier descrpition in AdminManufacturerSupplier 2013-09-02 14:15:33 +02:00
gRoussac 477457a44f Merge branch 'patch-1' of https://github.com/gr4devel/PrestaShop into gr4devel-patch-1 2013-09-02 12:03:01 +02:00
gr4devel 6177589cd3 [+] MO : add link to all manufacturer page and the feature to show All Suppliers 2013-09-02 11:57:16 +02:00
Vincent Augagneur b882ecfbbc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-02 11:44:01 +02:00
Vincent Augagneur a6aed9632a //dashboard data binding first part 2013-09-02 11:43:50 +02:00
gRoussac 4853772198 [-] INSTALLER : no update value in fix_download_product_feature_active 2013-09-02 11:33:53 +02:00
gRoussac 62303e58df [-] INSTALLER : Fix fatal error when upgrading 2013-09-02 11:24:46 +02:00
Gregory Roussac 82939730dd Merge pull request #667 from Ha99y/Small-Autoload-Fix
[-] CORE : Remove warning on rename on index.php
2013-09-02 02:11:51 -07:00
Kevin Granger 735b20866b // BO Bootstrap Search result page 2013-09-02 11:02:23 +02:00
gRoussac 397e42637a // norms 2013-09-02 10:49:50 +02:00
Kevin Granger 0a8a4dcece // BO Stats : Date Picker + Layout WIP 2013-09-02 10:47:07 +02:00
Gregory Roussac 6dc0edec3a Merge pull request #668 from lrosset/development
[-] CORE : Add APCu support
2013-09-02 01:46:25 -07:00
Gregory Roussac d019500d81 Merge pull request #670 from gr4devel/patch-2
[+] FO : add getManufacturer() to ManufacturerControllerCore
2013-09-02 01:31:14 -07:00
Vincent Augagneur 252eb868d9 //dashtrends before dashproducts 2013-09-02 10:15:57 +02:00