Commit Graph

2908 Commits

Author SHA1 Message Date
Damien Metzger a10b5a517f // Added visits to chart 2013-09-06 17:56:26 +02:00
Fabio Chelly 9377775eca [-] MO productcomments :
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented

#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
2013-09-06 17:54:12 +02:00
Damien Metzger 8df63f256d // Added chart data 2013-09-06 16:25:51 +02:00
Fabio Chelly 663f592306 [-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not
#PNM-627
#PNM-1610
#PNM-1616
2013-09-06 11:40:41 +02:00
Vincent Augagneur 3c2a086296 //merge 2013-09-05 19:10:59 +02:00
Vincent Augagneur 4b2ef10dd6 //dashboard data-chart-line added 2013-09-05 19:07:49 +02:00
gRoussac a7d619b208 [-] MO : fix bug #PSCFV-9906 again, bad url parsing 2013-09-05 18:39:07 +02:00
Rémi Gaillard 8868271c07 // push changes 2013-09-05 18:37:25 +02:00
sjousse 6b080e1f02 Optimize image copy in ShopImport module
2 things :
- copy images to new folder structure instead of legacy one since it's a PS 1.5 branch
- don't create all sizes of images at migration, there's an Admin controller for that (Admin > Settings > Images). That's speed up the import and remove duplicate code (less code to support).

+ some cleaning of unused variables
2013-09-05 18:24:02 +02:00
Vincent Augagneur e7495f3fe4 //oups 2013-09-05 17:38:17 +02:00
Vincent Augagneur 06b54d0519 //typo 2013-09-05 16:35:15 +02:00
Vincent Augagneur e4932131f6 //small fix 2013-09-05 16:25:42 +02:00
Vincent Augagneur 1c88bdd24e //dashboard widget regardless refresh 2013-09-05 11:52:18 +02:00
Damien Metzger 95c9edd87a // Fixed Gapi v3.0 token refresh 2013-09-05 11:42:57 +02:00
sjousse 2f6e0e3fae Changed the way to get the home category (get it from Configuration table now) 2013-09-05 10:14:31 +02:00
Rémi Gaillard 6e3d24b567 // add push 2013-09-04 19:33:05 +02:00
Damien Metzger 114b86ed43 // Stats 2013-09-04 19:15:14 +02:00
Vincent Augagneur 6b2492b62c //added data into dashproducts module 2013-09-04 18:26:58 +02:00
sjousse 4d68595447 ShopImporter module is now aware of multi-shop
Imported categories was affected to Root category instead of a Shop's Home category.
I took the first shop home category is by default.
Maybe adding an option to choose the shop where the datas should be imported.
2013-09-04 18:26:24 +02:00
sjousse e9d066c981 fix value of date_add 2013-09-04 16:40:12 +02:00
sjousse 56a1449c69 add date_add to categories 2013-09-04 16:32:00 +02:00
gRoussac 63c19ce1a9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-04 15:39:25 +02:00
gRoussac 3ca2c8da95 [-] BO : Fix #PSCFV-9906 could not register search engines keywords 2013-09-04 15:39:02 +02:00
Rémi Gaillard 00c1860d22 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-04 15:08:41 +02:00
Rémi Gaillard 9348768ceb [-] MO: Fix blocklayered sort by quantity #PSCFV-10300 2013-09-04 15:05:55 +02:00
Damien Metzger cf1f9a01db // More stats 2013-09-04 14:38:27 +02:00
Vincent Augagneur 40eab759dd //remove debug 2013-09-04 14:24:17 +02:00
Vincent Augagneur 08806f0240 //recents orders data-table for dashboard 2013-09-04 09:36:09 +02:00
Damien Metzger f29c2d3fcb // Added some figures to the dashboard 2013-09-03 18:00:34 +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
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
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
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
Damien Metzger 48d7bc890a // Fixed warning in AdminModulesController (variable conflict) 2013-09-02 17:11:41 +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
Kevin Granger 399f60b900 // BO Dashboard loading et trends 2013-09-02 15:17:05 +02:00
Vincent Augagneur d10a339542 //kevin special commit 2013-09-02 14:47:47 +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