dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,123 Commits 9 Branches 19 Tags
855c8a8de4fe07afcba50089feb997fe033dcf62
Commit Graph
2739 Commits
Author SHA1 Message Date
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
Vincent Augagneur a6aed9632a //dashboard data binding first part 2013-09-02 11:43:50 +02:00
Vincent Augagneur 252eb868d9 //dashtrends before dashproducts 2013-09-02 10:15:57 +02:00
Vincent Augagneur d8c4483265 //oups 2013-09-02 10:13:47 +02:00
Vincent Augagneur d0f2a37fff //dashboard module view tpl init 2013-09-02 10:10:20 +02:00
gRoussac a013be8380 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	modules/blockcart/ajax-cart.js
 2013-09-02 10:00:24 +02:00
Vincent Augagneur 10e720b93d //added new modules for dashboard 2013-09-02 09:40:24 +02:00
dlage 5f1e08e7e2 Fix variable context 
Avoid attribution to the variable $newProducts inside the if. It caused the code to potentially misbehave throwing errors of:
"variable $newProducts not defined".
 2013-09-01 22:47:41 +01:00
sagaradonis 9cd73b411d Update ajax-cart.js 
.size() replaced by .length as .size() is outdated
 2013-08-31 19:05:14 +05:30
gr4devel 39c8a8fc2d [+] MO : add the option to show all Manufacturer 
Add the option to show all Manufacturer in blocktopmenu module.
 2013-08-29 21:32:10 +02:00
Jerome Nadaud 40c64b54e2 [+] MO : Mailalerts - Add Total tax paid to order confirmation 2013-08-29 17:13:48 +02:00
Rémi Gaillard 2620242176 // Fix cms_block creation loop on shop addition 2013-08-27 09:52:14 +02:00
sjousse 536bdb550b fix file validation to use PHP native method 2013-08-26 18:23:39 +02:00
Vincent Augagneur ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Rémi Gaillard b7a03bdffa // sometimes image was not the cover one for blocklayered 2013-08-26 10:37:59 +02:00
Rémi Gaillard a23772dfb7 // small change in blockstore logo name 2013-08-26 10:33:25 +02:00
Damien Metzger eb69498d2c // Missing icon 2013-08-21 15:34:32 +02:00
Damien Metzger 4d3fc8c314 [-] MO : fixed smarty cache on blocksearch #PSCFV-8739 2013-08-21 15:13:49 +02:00
Damien Metzger ad2702e609 // Config files were translated in french 2013-08-20 17:49:05 +02:00
Damien Metzger eeb469dda5 [-] FO : fixed bad search redirection #PSCFV-10158 2013-08-20 14:52:53 +02:00