dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph
20926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gr4devel 36ca7f294a [+] BO : add TinyMCE editor for supplier descrpition in AdminManufacturerSupplier 2013-09-02 14:15:33 +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 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
gRoussac 4853772198 [-] INSTALLER : no update value in fix_download_product_feature_active 2013-09-02 11:33:53 +02:00
gRoussac 62303e58df [-] INSTALLER : Fix fatal error when upgrading 2013-09-02 11:24:46 +02:00
Gregory Roussac 82939730dd Merge pull request #667 from Ha99y/Small-Autoload-Fix 
[-] CORE : Remove warning on rename on index.php
 2013-09-02 02:11:51 -07:00
Kevin Granger 735b20866b // BO Bootstrap Search result page 2013-09-02 11:02:23 +02:00
gRoussac 397e42637a // norms 2013-09-02 10:49:50 +02:00
Kevin Granger 0a8a4dcece // BO Stats : Date Picker + Layout WIP 2013-09-02 10:47:07 +02:00
Gregory Roussac 6dc0edec3a Merge pull request #668 from lrosset/development 
[-] CORE : Add APCu support
 2013-09-02 01:46:25 -07: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 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
Gregory Roussac 00afa8ae47 Merge pull request #671 from gr4devel/patch-3 
[+] BO : enable TinyMCE editor for short and long descrpition in AdminManufacturers
 2013-09-02 01:09:10 -07: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
Jerome Nadaud 48dd826f7d [-] BO : List header module position fix 2013-09-02 09:47:35 +02:00
Vincent Augagneur 10e720b93d //added new modules for dashboard 2013-09-02 09:40:24 +02:00
Gregory Roussac a436456fa4 Merge pull request #673 from sagaradonis/development 
[*] FO : Deprecated .size() to .length
 2013-09-02 00:31:05 -07: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
PrestaEdit 4c633b8b46 [*] BO: sort modules name in Stats 2013-09-01 16:55:22 +02:00
sagaradonis 9cd73b411d Update ajax-cart.js 
.size() replaced by .length as .size() is outdated
 2013-08-31 19:05:14 +05:30
gr4devel 805e80e54c [+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController 2013-08-30 21:24:21 +02:00
Jerome Nadaud 5ce139e7f1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-30 17:41:36 +02:00
Jerome Nadaud 6445a38e71 // Fix cart override 2013-08-30 17:41:21 +02:00
Kevin Granger 84a0f9489c // add submenu shadow + allow html for tooltip 2013-08-30 17:39:37 +02:00
Jerome Nadaud aab9933ff2 // Fix price option render 2013-08-30 17:27:25 +02:00
Kevin Granger d4023ce0a3 // config Compass + Bower Update 2013-08-30 15:18:20 +02:00
Francois Gaillard d0087267df // Fixed tips of the day & encoding 2013-08-30 14:22:24 +02:00
Kevin Granger 0c494912a4 // BO fix product tabs 2013-08-30 11:51:57 +02:00
Rémi Gaillard f7fefe789d // typo fix 2013-08-30 11:21:00 +02:00
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