Commit Graph

19089 Commits

Author SHA1 Message Date
Rémi Gaillard 37e3b9e9e4 [-] WS: 404 error should be returned if a multishop entity does not exists #PSCFV-10229 2013-08-30 11:13:30 +02:00
Kevin Granger e4d58b7528 // submenu .active link 2013-08-30 11:13:28 +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
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
LOIC ROSSET ltd 24146181c6 Add APCu support 2013-08-29 20:13:58 +01:00
Kevin Granger 357c949faf // opti css menu 2013-08-29 18:54:36 +02:00
Francois Gaillard e6abe1c5a0 // Release branch merged 2013-08-29 18:46:34 +02:00
Rémi Gaillard eec8aaa4f8 // php noti 2013-08-29 18:15:51 +02:00
Kevin Granger 40e2b5b8d9 // fix BO modules list -> fav view 2013-08-29 17:23:26 +02:00
Rémi Gaillard 08b8277a7a ///// 2013-08-29 17:21:27 +02:00
Rémi Gaillard 51083e17af // 2013-08-29 17:18:05 +02:00
Jerome Nadaud 40c64b54e2 [+] MO : Mailalerts - Add Total tax paid to order confirmation 2013-08-29 17:13:48 +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 ffdc7b51b7 // php 5.2 2013-08-29 16:41:15 +02:00
Rémi Gaillard 1196c5d736 // php 5.2 2013-08-29 16:39:45 +02:00
Damien Metzger 36815be192 // Fixed warning 2013-08-29 16:33:06 +02:00
Kevin Granger c07f226dd4 // fix dashboard gfx 2013-08-29 16:17:40 +02:00
Rémi Gaillard 01cbffad9b //miss on last commit 2013-08-29 16:11:24 +02:00
Damien Metzger 33578dfd5e // Class index with Dashboard 2013-08-29 15:58:58 +02:00
Kevin Granger 618d980dc7 [+] add css for graph and temp avatar 2013-08-29 15:48:14 +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
Rémi Gaillard 6d1c8c54af Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-29 10:49:53 +02:00
djfm be83f1364d // updated Czech localization pack 2013-08-29 10:49:39 +02:00
Rémi Gaillard fb397d3163 Merge pull request #662 from djfm/localization
// updated Czech localization pack
2013-08-29 01:43:33 -07:00
Damien Metzger f24391be5a // Fixed hook::getidbyname case 2013-08-29 09:39:48 +02:00
Damien Metzger 5dee3ca245 // Fixed hook::getidbyname case 2013-08-29 09:33:28 +02:00
ha99y 75303e82e0 Suppress Error at rename
If debugging  is one (_PS_MODE_DEV_ set to TRUE)
there is a warning on line 142 in /classes/Autoload.php at function
rename()
2013-08-28 18:56:49 -07: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
Jerome Nadaud c8d9b9bf3a [+] BO : Page header toolbar 2013-08-28 14:07:50 +02:00
Jerome Nadaud a76fc165db [-] BO : Page header toolbar 2013-08-28 13:43:42 +02:00
Rémi Gaillard c72fd867fe // git checkout controllers/ 2013-08-28 12:24:10 +02:00
Rémi Gaillard 63d9005a10 // liveedit 2013-08-28 12:21:01 +02:00
Jerome Nadaud 9d991f3474 [+] BO : Page header toolbar 2013-08-28 11:16:36 +02:00
Jerome Nadaud 4a7e68ae05 // Modules list fix 2013-08-28 10:18:43 +02:00
Jerome Nadaud bfe6c07053 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-28 10:17:25 +02:00
Jerome Nadaud e204cbf24e [+] BO : Page header toolbar 2013-08-28 10:17:07 +02:00
Kevin Granger 97e342984d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-28 10:07:02 +02:00
Kevin Granger ecb4d65347 // list toolbar 2013-08-28 10:06:52 +02:00
Vincent Augagneur 0019426e81 //added dashboard controller 2013-08-28 10:04:28 +02:00
Vincent Augagneur 0a2d8175a7 //small fix 2013-08-28 10:03:50 +02:00
Damien Metzger 7a429cd3ea // Version number 2013-08-28 10:00:29 +02:00
Damien Metzger 330aed3f7a // Translations 2013-08-28 09:51:02 +02:00
Vincent Augagneur efc44392b6 //small fix 2013-08-28 09:48:01 +02:00
Jerome Nadaud 967fc98693 [+] BO : Page header toolbar 2013-08-28 09:37:49 +02:00
ha99y ffd712312d Add new argument to function getImages
1st: The function will return the product attribute id's with the list.
2nd: If product attribute id is passed to the function it will return
only the image id of the given attribute.
2013-08-28 00:27:52 -07:00
Jerome Nadaud 068da6f87c [+] BO : Page header toolbar 2013-08-28 09:24:16 +02:00