 Rémi Gaillard
|
5e7dbea970
|
//
|
2013-09-24 17:22:50 +02:00 |
|
|
Rémi Gaillard
|
beb0a74135
|
// use ObjectModel::validateField on validaterules
|
2013-09-24 17:12:28 +02:00 |
|
|
Jerome Nadaud
|
479662aa10
|
// Fix missing table id for shop asso in helper
|
2013-09-24 16:19:38 +02:00 |
|
|
gRoussac
|
c9b53685c5
|
// parse error
|
2013-09-24 15:44:56 +02:00 |
|
|
gRoussac
|
1cc92fc9c2
|
[-] CORE : Could not add too long tags
|
2013-09-24 15:40:18 +02:00 |
|
|
Damien Metzger
|
799efcba3f
|
[*] BO : Customers KPIs
|
2013-09-24 15:32:05 +02:00 |
|
|
gRoussac
|
17323a04b6
|
[-] CORE : Missing tag max size
|
2013-09-24 15:10:14 +02:00 |
|
|
Jerome Nadaud
|
6e2337df44
|
// Add id attribute to tree header button
|
2013-09-24 12:27:51 +02:00 |
|
|
Damien Metzger
|
8f08f67812
|
[+] BO : Added fees configuration for the dashboard
|
2013-09-24 12:22:40 +02:00 |
|
|
Rémi Gaillard
|
41af17e06b
|
[-] BO: Fix data validation when iframe is allowed on some entities like CMS
|
2013-09-24 10:28:04 +02:00 |
|
|
djfm
|
d9a24d61ac
|
// change comment
|
2013-09-23 16:37:13 +00:00 |
|
|
djfm
|
6195d0c319
|
[*] LO : Use single quote as thousands separator for CHF currency
|
2013-09-23 16:32:40 +00:00 |
|
|
gRoussac
|
ccb3179c1a
|
[-] CORE : Partial fix for #PSCFV-10482 getCacheId is different in back office
|
2013-09-23 18:07:46 +02:00 |
|
|
Damien Metzger
|
6796b64e18
|
Merge pull request #691 from djfm/development
// fixed translation of modules descriptions containing quotes
|
2013-09-23 07:51:57 -07:00 |
|
|
gRoussac
|
3b075e049b
|
// bad commit
|
2013-09-23 16:33:44 +02:00 |
|
|
gRoussac
|
84dc75f57e
|
[-] CORE : Fix bug #PSCFV-10471 Cart item count problem, unique_id grouping error for id_product and id_product_attribute
|
2013-09-23 16:32:38 +02:00 |
|
|
Rémi Gaillard
|
50bbf1a547
|
// small fix
|
2013-09-23 10:46:41 +02:00 |
|
|
Rémi Gaillard
|
a578cfb2e2
|
[-] FO: Fix #PSCFV-10461
|
2013-09-23 10:20:22 +02:00 |
|
|
gRoussac
|
39468476ab
|
[-] CORE : #PSCFV-10461 customer group in getPriceStatic, pull request https://github.com/kpodemski/kp-PrestaShop/commit/361ebc72e09d00463bb7a7b7af670e3235ab6a5a
|
2013-09-23 09:50:12 +02:00 |
|
|
Jerome Nadaud
|
e9cd8ac145
|
// Search tree toolbar button
|
2013-09-20 16:20:27 +02:00 |
|
|
Rémi Gaillard
|
7aa348eb93
|
// bad char
|
2013-09-20 15:48:22 +02:00 |
|
|
gRoussac
|
429c9442a3
|
[*] CORE : bad else if in getTemplatePath
|
2013-09-20 15:10:14 +02:00 |
|
|
Jerome Nadaud
|
f312a055b1
|
// Multistore bootstrap design
|
2013-09-20 15:04:43 +02:00 |
|
|
Rémi Gaillard
|
9b878a33a8
|
// fix canonical and ssl page without ssl
|
2013-09-20 14:12:41 +02:00 |
|
|
Rémi Gaillard
|
e2ac223f4e
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-20 11:34:54 +02:00 |
|
|
Rémi Gaillard
|
5b7580d487
|
[-] MO: Fix time of smarty cache invalidation
|
2013-09-20 11:33:30 +02:00 |
|
|
Damien Metzger
|
1cebd5920e
|
[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
|
2013-09-20 11:09:22 +02:00 |
|
|
Damien Metzger
|
f8ca06d927
|
// Better cache depth management for smarty
|
2013-09-20 10:26:58 +02:00 |
|
|
Vincent Augagneur
|
150b68b96b
|
//displayError & displayConfirmation use bootstrap design
|
2013-09-19 16:52:58 +02:00 |
|
|
djfm
|
0a9f425281
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 16:08:44 +00:00 |
|
|
gRoussac
|
4e1d6de9b0
|
[-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated
|
2013-09-18 17:57:00 +02:00 |
|
|
gRoussac
|
75a9629b8a
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 17:23:23 +02:00 |
|
|
gRoussac
|
27f14b9a31
|
[-] BO : Fix proces and save buttons for Modules and AdminControllers
|
2013-09-18 17:23:08 +02:00 |
|
|
Rémi Gaillard
|
f6dc81d0f1
|
// small fix for SSL
|
2013-09-18 17:19:03 +02:00 |
|
|
Rémi Gaillard
|
0452979ce7
|
[*] FO: Allow to enable SSL on all the pages
|
2013-09-18 16:30:34 +02:00 |
|
|
gRoussac
|
93aae26269
|
[-] Bo : Modules 'save' button not active
|
2013-09-18 15:41:30 +02:00 |
|
|
Damien Metzger
|
39fdc8c926
|
[+] BO : Added new class ConfigurationKPI for KPI cache storage
|
2013-09-18 15:09:04 +02:00 |
|
|
Jerome Nadaud
|
5a206e83a8
|
// Security
|
2013-09-18 10:43:58 +02:00 |
|
|
Damien Metzger
|
f7855f2a3a
|
// Always more KPIs
|
2013-09-17 12:47:13 +02:00 |
|
|
Rémi Gaillard
|
e6e8efc19a
|
[-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop
|
2013-09-17 11:58:12 +02:00 |
|
|
Rémi Gaillard
|
6ee6317fee
|
// orderby position
|
2013-09-17 11:07:29 +02:00 |
|
|
gRoussac
|
2d5bd901f4
|
[*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3
|
2013-09-16 18:51:06 +02:00 |
|
|
Damien Metzger
|
8934f9c7ed
|
[*] BO : Connected the first KPIs to real data
|
2013-09-16 18:40:34 +02:00 |
|
|
gRoussac
|
15dd1cf96f
|
[-] BO : Fix bugPSCFV-10249 images copy when unix path
|
2013-09-16 17:16:11 +02:00 |
|
|
Jerome Nadaud
|
235af94a92
|
// Fix Page header toolbar
|
2013-09-16 17:05:27 +02:00 |
|
|
Jerome Nadaud
|
7e8d119213
|
// Textarea autosize
|
2013-09-16 14:25:49 +02:00 |
|
|
Damien Metzger
|
e68c124218
|
[-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396
|
2013-09-16 11:42:11 +02:00 |
|
|
Vincent Augagneur
|
e0739ea1e0
|
Merge pull request #720 from makk1ntosh/development
//Added ui.button as dependency of ui.dialog
|
2013-09-16 01:35:25 -07:00 |
|
|
Jerome Nadaud
|
c0afb55d11
|
[-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link
|
2013-09-16 09:25:10 +02:00 |
|
|
Jerome Nadaud
|
74237ff694
|
// Some fix
|
2013-09-13 17:11:12 +02:00 |
|