f165dae15d
//now you can refresh each dashboard module you want
2013-09-02 17:22:51 +02:00
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
f7eb6b3a16
Merge pull request #665 from Ha99y/Get-Combination-Images
...
[*] CLASSES : Add $id_product_attribute param to Image::getImages
2013-09-02 08:11:48 -07:00
48d7bc890a
// Fixed warning in AdminModulesController (variable conflict)
2013-09-02 17:11:41 +02:00
6059b4301a
// states list
2013-09-02 17:10:20 +02:00
c1cdc90343
[+] MO : new module Gapi for Google Analytics API
2013-09-02 17:07:19 +02:00
121554026c
// adjustments on modules dash
2013-09-02 16:41:48 +02:00
36d9e0eed5
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-02 16:28:56 +02:00
c6d2e1252e
[-] INSTALLER : Fix fatal error in upgrade, could not load configuration class
2013-09-02 16:28:38 +02:00
af3051ca8f
// BO Dashboard : animate transition
2013-09-02 16:09:27 +02:00
81c47a085e
//fix remove class loading
2013-09-02 15:41:28 +02:00
399f60b900
// BO Dashboard loading et trends
2013-09-02 15:17:05 +02:00
f778b0da25
//remove class loading after widget filling
2013-09-02 15:09:27 +02:00
fe209e0c55
Merge pull request #678 from gr4devel/patch-5
...
[*] BO : add TinyMCE editor for supplier descrpition in AdminSuppliers
2013-09-02 06:03:20 -07:00
0cf96cd059
//small fix
2013-09-02 14:58:17 +02:00
d10a339542
//kevin special commit
2013-09-02 14:47:47 +02:00
f535d60a29
[-] fix typo in adding TinyMCE editor for supplier descrpition in AdminSuppliersController
2013-09-02 14:24:18 +02:00
36ca7f294a
[+] BO : add TinyMCE editor for supplier descrpition in AdminManufacturerSupplier
2013-09-02 14:15:33 +02:00
477457a44f
Merge branch 'patch-1' of https://github.com/gr4devel/PrestaShop into gr4devel-patch-1
2013-09-02 12:03:01 +02:00
6177589cd3
[+] MO : add link to all manufacturer page and the feature to show All Suppliers
2013-09-02 11:57:16 +02:00
b882ecfbbc
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-02 11:44:01 +02:00
a6aed9632a
//dashboard data binding first part
2013-09-02 11:43:50 +02:00
4853772198
[-] INSTALLER : no update value in fix_download_product_feature_active
2013-09-02 11:33:53 +02:00
62303e58df
[-] INSTALLER : Fix fatal error when upgrading
2013-09-02 11:24:46 +02:00
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
735b20866b
// BO Bootstrap Search result page
2013-09-02 11:02:23 +02:00
397e42637a
// norms
2013-09-02 10:49:50 +02:00
0a8a4dcece
// BO Stats : Date Picker + Layout WIP
2013-09-02 10:47:07 +02:00
6dc0edec3a
Merge pull request #668 from lrosset/development
...
[-] CORE : Add APCu support
2013-09-02 01:46:25 -07:00
d019500d81
Merge pull request #670 from gr4devel/patch-2
...
[+] FO : add getManufacturer() to ManufacturerControllerCore
2013-09-02 01:31:14 -07:00
252eb868d9
//dashtrends before dashproducts
2013-09-02 10:15:57 +02:00
d8c4483265
//oups
2013-09-02 10:13:47 +02:00
d0f2a37fff
//dashboard module view tpl init
2013-09-02 10:10:20 +02:00
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
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
48dd826f7d
[-] BO : List header module position fix
2013-09-02 09:47:35 +02:00
10e720b93d
//added new modules for dashboard
2013-09-02 09:40:24 +02:00
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
4c633b8b46
[*] BO: sort modules name in Stats
2013-09-01 16:55:22 +02:00
9cd73b411d
Update ajax-cart.js
...
.size() replaced by .length as .size() is outdated
2013-08-31 19:05:14 +05:30
805e80e54c
[+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController
2013-08-30 21:24:21 +02:00
5ce139e7f1
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-30 17:41:36 +02:00
6445a38e71
// Fix cart override
2013-08-30 17:41:21 +02:00
84a0f9489c
// add submenu shadow + allow html for tooltip
2013-08-30 17:39:37 +02:00
aab9933ff2
// Fix price option render
2013-08-30 17:27:25 +02:00
d4023ce0a3
// config Compass + Bower Update
2013-08-30 15:18:20 +02:00
d0087267df
// Fixed tips of the day & encoding
2013-08-30 14:22:24 +02:00
0c494912a4
// BO fix product tabs
2013-08-30 11:51:57 +02:00
f7fefe789d
// typo fix
2013-08-30 11:21:00 +02:00
Vincent Augagneur
dlage