Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• 5dc2eec97d //added tab content in dashproduct module Vincent Augagneur 2013-09-03 10:38:43 +02:00
• 61d10abc76 // Use date_from and date_to in dashboard stats Damien Metzger 2013-09-03 10:34:21 +02:00
• 7b902ac99d //added param date_from & date_to on hookDashboardDatas Vincent Augagneur 2013-09-03 10:30:08 +02:00
• 4d3b378965 //added form date range picker on dashboard Vincent Augagneur 2013-09-03 10:19:15 +02:00
• 656717fb4c Merge pull request #679 from kluevandrew/patch-3 Gregory Roussac 2013-09-03 00:51:38 -07:00
• e08c8b2d25 Merge pull request #674 from PrestaEdit/patch-50 Gregory Roussac 2013-09-03 00:49:11 -07:00
• 97f1db480a BO: Cursor "pointer" for .button Andrew 2013-09-03 11:35:50 +04:00
• 19fc22fbf0 // Added translations directory to module gapi Damien Metzger 2013-09-02 20:34:43 +02:00
• 1fc507d8d2 // Added configuration checks to the Google Analytics modules // Implemented the first real data in the dashboard Damien Metzger 2013-09-02 20:18:29 +02:00
• c3772fb355 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-09-02 19:11:17 +02:00
• da12fbdd5e [-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes Jerome Nadaud 2013-09-02 19:09:47 +02:00
• 268183f4d2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-02 19:05:55 +02:00
• 2f5054cb92 // fix anime dashboard loading Kevin Granger 2013-09-02 19:05:34 +02:00
• 63a9fd0236 [*] MO : Added help in the Google Analytics API module Damien Metzger 2013-09-02 18:54:24 +02:00
• 94bdde4630 [-] CORE : Remove PHP Warning: file_put_contents on modules config.xml gRoussac 2013-09-02 18:19:21 +02:00
• abf5ad195c Merge pull request #676 from dlage/patch-1 Gregory Roussac 2013-09-02 08:58:32 -07:00
• 11cd88cf63 //data bind dashtrends module Vincent Augagneur 2013-09-02 17:25:33 +02:00
• 9265676f0d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-09-02 17:23:00 +02:00
• f165dae15d //now you can refresh each dashboard module you want Vincent Augagneur 2013-09-02 17:22:51 +02:00
• b2ccf88296 Merge pull request #663 from sjousse/patch-1 Gregory Roussac 2013-09-02 08:21:42 -07:00
• f7eb6b3a16 Merge pull request #665 from Ha99y/Get-Combination-Images Gregory Roussac 2013-09-02 08:11:48 -07:00
• 48d7bc890a // Fixed warning in AdminModulesController (variable conflict) Damien Metzger 2013-09-02 17:11:41 +02:00
• 6059b4301a // states list Rémi Gaillard 2013-09-02 17:10:20 +02:00
• c1cdc90343 [+] MO : new module Gapi for Google Analytics API Damien Metzger 2013-09-02 17:07:19 +02:00
• 121554026c // adjustments on modules dash Kevin Granger 2013-09-02 16:41:48 +02:00
• 36d9e0eed5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-02 16:28:56 +02:00
• c6d2e1252e [-] INSTALLER : Fix fatal error in upgrade, could not load configuration class gRoussac 2013-09-02 16:28:38 +02:00
• af3051ca8f // BO Dashboard : animate transition Kevin Granger 2013-09-02 16:09:27 +02:00
• 81c47a085e //fix remove class loading Vincent Augagneur 2013-09-02 15:41:28 +02:00
• 399f60b900 // BO Dashboard loading et trends Kevin Granger 2013-09-02 15:17:05 +02:00
• f778b0da25 //remove class loading after widget filling Vincent Augagneur 2013-09-02 15:09:27 +02:00
• fe209e0c55 Merge pull request #678 from gr4devel/patch-5 Gregory Roussac 2013-09-02 06:03:20 -07:00
• 0cf96cd059 //small fix Vincent Augagneur 2013-09-02 14:58:17 +02:00
• d10a339542 //kevin special commit Vincent Augagneur 2013-09-02 14:47:47 +02:00
• f535d60a29 [-] fix typo in adding TinyMCE editor for supplier descrpition in AdminSuppliersController gr4devel 2013-09-02 14:24:18 +02:00
• 36ca7f294a [+] BO : add TinyMCE editor for supplier descrpition in AdminManufacturerSupplier gr4devel 2013-09-02 14:15:33 +02:00
• 477457a44f Merge branch 'patch-1' of https://github.com/gr4devel/PrestaShop into gr4devel-patch-1 gRoussac 2013-09-02 12:03:01 +02:00
• 6177589cd3 [+] MO : add link to all manufacturer page and the feature to show All Suppliers gr4devel 2013-09-02 11:57:16 +02:00
• b882ecfbbc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-09-02 11:44:01 +02:00
• a6aed9632a //dashboard data binding first part Vincent Augagneur 2013-09-02 11:43:50 +02:00
• 4853772198 [-] INSTALLER : no update value in fix_download_product_feature_active gRoussac 2013-09-02 11:33:53 +02:00
• 62303e58df [-] INSTALLER : Fix fatal error when upgrading gRoussac 2013-09-02 11:24:46 +02:00
• 82939730dd Merge pull request #667 from Ha99y/Small-Autoload-Fix Gregory Roussac 2013-09-02 02:11:51 -07:00
• 735b20866b // BO Bootstrap Search result page Kevin Granger 2013-09-02 11:02:23 +02:00
• 397e42637a // norms gRoussac 2013-09-02 10:49:50 +02:00
• 0a8a4dcece // BO Stats : Date Picker + Layout WIP Kevin Granger 2013-09-02 10:47:07 +02:00
• 6dc0edec3a Merge pull request #668 from lrosset/development Gregory Roussac 2013-09-02 01:46:25 -07:00
• d019500d81 Merge pull request #670 from gr4devel/patch-2 Gregory Roussac 2013-09-02 01:31:14 -07:00
• 252eb868d9 //dashtrends before dashproducts Vincent Augagneur 2013-09-02 10:15:57 +02:00
• d8c4483265 //oups Vincent Augagneur 2013-09-02 10:13:47 +02:00
• d0f2a37fff //dashboard module view tpl init Vincent Augagneur 2013-09-02 10:10:20 +02:00
• 00afa8ae47 Merge pull request #671 from gr4devel/patch-3 Gregory Roussac 2013-09-02 01:09:10 -07:00
• a013be8380 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-02 10:00:24 +02:00
• 48dd826f7d [-] BO : List header module position fix Jerome Nadaud 2013-09-02 09:47:35 +02:00
• 10e720b93d //added new modules for dashboard Vincent Augagneur 2013-09-02 09:40:24 +02:00
• a436456fa4 Merge pull request #673 from sagaradonis/development Gregory Roussac 2013-09-02 00:31:05 -07:00
• 5f1e08e7e2 Fix variable context dlage 2013-09-01 22:47:41 +01:00
• 4c633b8b46 [*] BO: sort modules name in Stats PrestaEdit 2013-09-01 16:55:22 +02:00
• 9cd73b411d Update ajax-cart.js sagaradonis 2013-08-31 19:05:14 +05:30
• 805e80e54c [+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController gr4devel 2013-08-30 21:24:21 +02:00
• 5ce139e7f1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap bootstrap Jerome Nadaud 2013-08-30 17:41:36 +02:00
• 6445a38e71 // Fix cart override Jerome Nadaud 2013-08-30 17:41:21 +02:00
• 84a0f9489c // add submenu shadow + allow html for tooltip Kevin Granger 2013-08-30 17:39:37 +02:00
• aab9933ff2 // Fix price option render Jerome Nadaud 2013-08-30 17:27:25 +02:00
• d4023ce0a3 // config Compass + Bower Update Kevin Granger 2013-08-30 15:18:20 +02:00
• d0087267df // Fixed tips of the day & encoding Francois Gaillard 2013-08-30 14:22:24 +02:00
• 0c494912a4 // BO fix product tabs Kevin Granger 2013-08-30 11:51:57 +02:00
• f7fefe789d // typo fix Rémi Gaillard 2013-08-30 11:21:00 +02:00
• 37e3b9e9e4 [-] WS: 404 error should be returned if a multishop entity does not exists #PSCFV-10229 Rémi Gaillard 2013-08-30 11:13:30 +02:00
• e4d58b7528 // submenu .active link Kevin Granger 2013-08-30 11:13:28 +02:00
• b72f2a7176 [+] FO : add getManufacturer() to ManufacturerControllerCore gr4devel 2013-08-29 21:48:32 +02:00
• 39c8a8fc2d [+] MO : add the option to show all Manufacturer gr4devel 2013-08-29 21:32:10 +02:00
• 24146181c6 Add APCu support LOIC ROSSET ltd 2013-08-29 20:13:58 +01:00
• 357c949faf // opti css menu Kevin Granger 2013-08-29 18:54:36 +02:00
• 6c0867f314 // Release branch merged 1.5.5.0 master Francois Gaillard 2013-08-29 18:47:19 +02:00
• e6abe1c5a0 // Release branch merged Francois Gaillard 2013-08-29 18:46:34 +02:00
• eec8aaa4f8 // php noti Rémi Gaillard 2013-08-29 18:15:51 +02:00
• 40e2b5b8d9 // fix BO modules list -> fav view Kevin Granger 2013-08-29 17:23:26 +02:00
• 08b8277a7a ///// Rémi Gaillard 2013-08-29 17:21:27 +02:00
• 51083e17af // Rémi Gaillard 2013-08-29 17:18:05 +02:00
• 40c64b54e2 [+] MO : Mailalerts - Add Total tax paid to order confirmation Jerome Nadaud 2013-08-29 17:13:48 +02:00
• 7d4c0ad36e // fix col-offset and btn-primary Kevin Granger 2013-08-29 17:04:10 +02:00
• 4a8f6c3116 // Modules categories sort Francois Gaillard 2013-08-29 17:00:34 +02:00
• ffdc7b51b7 // php 5.2 Rémi Gaillard 2013-08-29 16:39:45 +02:00
• 1196c5d736 // php 5.2 Rémi Gaillard 2013-08-29 16:39:45 +02:00
• 36815be192 // Fixed warning Damien Metzger 2013-08-29 16:33:06 +02:00
• c07f226dd4 // fix dashboard gfx Kevin Granger 2013-08-29 16:17:40 +02:00
• 01cbffad9b //miss on last commit Rémi Gaillard 2013-08-29 16:11:24 +02:00
• 33578dfd5e // Class index with Dashboard Damien Metzger 2013-08-29 15:58:58 +02:00
• 618d980dc7 [+] add css for graph and temp avatar Kevin Granger 2013-08-29 15:48:14 +02:00
• c5ab91f171 [+] BO dashboard WIP Kevin Granger 2013-08-29 14:52:14 +02:00
• c736c28ab5 // small ajax.php clean Rémi Gaillard 2013-08-29 11:47:11 +02:00
• 6d1c8c54af Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-08-29 10:49:53 +02:00
• be83f1364d // updated Czech localization pack djfmandRémi Gaillard 2013-08-26 14:47:54 +00:00
• fb397d3163 Merge pull request #662 from djfm/localization Rémi Gaillard 2013-08-29 01:43:33 -07:00
• f24391be5a // Fixed hook::getidbyname case Damien Metzger 2013-08-29 09:33:28 +02:00
• 5dee3ca245 // Fixed hook::getidbyname case Damien Metzger 2013-08-29 09:33:28 +02:00
• 75303e82e0 Suppress Error at rename ha99y 2013-08-28 18:56:49 -07:00
• 8660a24d55 [+] Dashboard Markup WIP Kevin Granger 2013-08-28 19:26:19 +02:00
• ddc16a2f65 [-] BO: Fix fatal error on customer edition when email is not valid Rémi Gaillard 2013-08-28 17:46:05 +02:00