dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,089 Commits 9 Branches 19 Tags
bb35a5b00414bbca76569fa2b9d5df875f6b0140
Commit Graph

6077 Commits

Author SHA1 Message Date
gRoussac ec556bb307 // remove Warning on array_map() 2013-09-08 20:01:55 +02:00
Jerome Nadaud f6355ff2d5 [-] BO : Change categories tree method 2013-09-06 17:09:32 +02:00
Francois Gaillard 768a8b36d5 [-] BO : AdminModulesController - Bug fix, $params was not set 2013-09-06 15:41:24 +02:00
Kevin Granger 1b2bab6943 // performance 2013-09-06 11:03:36 +02:00
Fabio Chelly 7e1c0d5a24 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-06 09:24:43 +02:00
Rémi Gaillard 8868271c07 // push changes 2013-09-05 18:37:25 +02:00
Vincent Augagneur 4124a48b1e //added check on range picker if date from is superior than date to 2013-09-05 16:34:03 +02:00
Rémi Gaillard 0f81518ba2 // Add a buton to erase all log 2013-09-05 15:58:36 +02:00
Vincent Augagneur c34dbcf43a //dashboard range date choice in ajax 👍 2013-09-05 15:25:41 +02:00
Sarah Lorenzini f09347a8be // update backup BDD, import, and email pages 2013-09-05 14:55:07 +02:00
Sarah Lorenzini 73524c7a4c // update maintenance and email pages 2013-09-05 14:16:06 +02:00
Rémi Gaillard 6e3d24b567 // add push 2013-09-04 19:33:05 +02:00
Kevin Granger 22d636f93a // Colored switch, removed "required field" legend, removed duplicate links quick access 2013-09-04 18:14:11 +02:00
Kevin Granger 671d419c27 // Carrier Wizard with bootstrap WIP 2013-09-03 19:36:04 +02:00
gRoussac 6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack 2013-09-03 18:20:58 +02:00
Vincent Augagneur b840f28137 //oups 2013-09-03 15:13:05 +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
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
Vincent Augagneur 70e6aea7c3 //typo 2013-09-03 10:59:12 +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 e08c8b2d25 Merge pull request #674 from PrestaEdit/patch-50 
[*] BO: sort modules name in Stats
 2013-09-03 00:49:11 -07: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
Damien Metzger 48d7bc890a // Fixed warning in AdminModulesController (variable conflict) 2013-09-02 17:11:41 +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
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
Kevin Granger 735b20866b // BO Bootstrap Search result page 2013-09-02 11:02:23 +02:00
Kevin Granger 0a8a4dcece // BO Stats : Date Picker + Layout WIP 2013-09-02 10:47:07 +02: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 d0f2a37fff //dashboard module view tpl init 2013-09-02 10:10:20 +02:00
PrestaEdit 4c633b8b46 [*] BO: sort modules name in Stats 2013-09-01 16:55:22 +02:00
gr4devel 805e80e54c [+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController 2013-08-30 21:24:21 +02:00
Francois Gaillard d0087267df // Fixed tips of the day & encoding 2013-08-30 14:22:24 +02:00
gr4devel b72f2a7176 [+] FO : add getManufacturer() to ManufacturerControllerCore 
Add getManufacturer() to ManufacturerControllerCore to access the protected manufacturer instance of the controller.
 2013-08-29 21:48:32 +02:00
Francois Gaillard e6abe1c5a0 // Release branch merged 2013-08-29 18:46:34 +02:00
Rémi Gaillard 51083e17af // 2013-08-29 17:18:05 +02:00
Kevin Granger 7d4c0ad36e // fix col-offset and btn-primary 2013-08-29 17:04:10 +02:00
Francois Gaillard 4a8f6c3116 // Modules categories sort 2013-08-29 17:00:34 +02:00
Rémi Gaillard 01cbffad9b //miss on last commit 2013-08-29 16:11:24 +02:00
Kevin Granger c5ab91f171 [+] BO dashboard WIP 2013-08-29 14:52:14 +02:00
Rémi Gaillard c736c28ab5 // small ajax.php clean 2013-08-29 11:47:11 +02:00
Kevin Granger 8660a24d55 [+] Dashboard Markup WIP 2013-08-28 19:26:19 +02:00
Rémi Gaillard ddc16a2f65 [-] BO: Fix fatal error on customer edition when email is not valid 2013-08-28 17:46:05 +02:00
Jerome Nadaud 1fd6540574 [+] BO : Page header toolbar 2013-08-28 14:14:04 +02:00