gRoussac
|
2a3192d98c
|
[-] IN : Refacto for update_customer_default_group bad logical
|
2013-11-03 14:55:25 +01:00 |
|
gRoussac
|
b16e4b5a8e
|
[-] IN : Lower memory usage in migrate_orders, fix update_order_messages loop
|
2013-11-03 01:49:16 +01:00 |
|
gRoussac
|
8f72282594
|
[-] IN : update_customer_default_group returning false
|
2013-11-02 21:51:13 +01:00 |
|
gRoussac
|
a5bb4f0323
|
[-] IN: Fix [insert order detail 1] error while upgrading
|
2013-11-02 20:39:53 +01:00 |
|
gRoussac
|
062fb90c2e
|
[-] IN : Fix Unknown column 'module_name' in 'ps_webservice_account' during upgrade
|
2013-10-31 19:24:41 +01:00 |
|
Jerome Nadaud
|
9193a29a44
|
[+] MO : Blockcart - Add error handler on ajax function
|
2013-10-31 19:02:43 +01:00 |
|
Jerome Nadaud
|
671062af07
|
// Add Disable overrides to debug mode
|
2013-10-31 18:41:56 +01:00 |
|
gRoussac
|
80c60be952
|
[-] BO : Do not enable rewrite url for index
|
2013-10-31 16:20:55 +01:00 |
|
Rémi Gaillard
|
1b019dffc5
|
// Fix lang detection on dispatcher
|
2013-10-31 15:28:19 +01:00 |
|
gRoussac
|
f9dc0b0252
|
[-] MO : Could not translate in transit mail, revert from 3213b5dffb
|
2013-10-31 14:20:21 +01:00 |
|
Rémi Gaillard
|
9611ea1f70
|
[-] BO: Fix empty group list on changing opt or newsletter on customers listing
|
2013-10-31 11:22:40 +01:00 |
|
Rémi Gaillard
|
d17515a728
|
// don't format currency on input
|
2013-10-31 10:22:38 +01:00 |
|
gRoussac
|
036fa7cba6
|
[-] FO : Fix bug #PSCFV-10889 wrong color when oos product
|
2013-10-31 10:18:28 +01:00 |
|
Damien Metzger
|
9c57c71deb
|
Merge pull request #913 from djfm/development
// Installer Translations
|
2013-10-31 01:48:56 -07:00 |
|
djfm
|
7812731095
|
// removed hard-coded space before ellipsis (...) in English installer steps
|
2013-10-31 08:29:05 +00:00 |
|
djfm
|
a8a204edf3
|
// small correction in English installer text
|
2013-10-31 08:25:57 +00:00 |
|
djfm
|
11f60492be
|
// removed unnecessary punctuation in English installer strings, both in source code and translations
|
2013-10-31 08:09:14 +00:00 |
|
gRoussac
|
f919cc899d
|
[-] IN : Set conversion rate to 1 if equal 0 in base
|
2013-10-30 20:06:47 +01:00 |
|
gRoussac
|
fbdddba753
|
[-] IN : Set default conversion rate to 1 not 0
|
2013-10-30 19:03:36 +01:00 |
|
gRoussac
|
cbfa8dfc30
|
// forgot to commit in f78cde96d6
|
2013-10-30 19:02:24 +01:00 |
|
gRoussac
|
8547f663d1
|
[-] BO : AdminImport withdraw separator changed in js
|
2013-10-30 18:46:02 +01:00 |
|
gRoussac
|
372130f7d7
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-10-30 18:37:46 +01:00 |
|
gRoussac
|
f78cde96d6
|
[-] BO : AdminImport wrong group by default
|
2013-10-30 18:37:26 +01:00 |
|
Jerome Nadaud
|
48f00b2367
|
[-] BO : FixBug #PSCFV-10882 - Add json encode and decode smarty modifier via tools class
|
2013-10-30 18:28:17 +01:00 |
|
djfm
|
c958436a76
|
// Dutch installer translations
|
2013-10-30 17:26:22 +00:00 |
|
djfm
|
a56fb7c639
|
// Polish installer translations
|
2013-10-30 17:06:52 +00:00 |
|
djfm
|
16efe89bed
|
// improved installer translations: no colons in translations and filled some missing fields
|
2013-10-30 16:57:30 +00:00 |
|
gRoussac
|
56799f53c8
|
[-] Bo : AdminImport customer group default
|
2013-10-30 17:12:20 +01:00 |
|
Jerome Nadaud
|
da43700361
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-10-30 16:48:26 +01:00 |
|
Jerome Nadaud
|
d7b46e80af
|
[+] BO : Add debug mode system
|
2013-10-30 16:48:16 +01:00 |
|
gRoussac
|
b311a0c719
|
[-] BO : Fix bug #PSCFV-10872 AdminImport could not import supllier orders
|
2013-10-30 16:06:38 +01:00 |
|
Rémi Gaillard
|
a0f4eab4c1
|
// typo
|
2013-10-30 15:40:40 +01:00 |
|
gRoussac
|
9ef10ee806
|
[-] IN : Handle RC PHP_VERSION
|
2013-10-30 15:03:07 +01:00 |
|
Rémi Gaillard
|
f9b1545037
|
// missing file
|
2013-10-30 14:59:08 +01:00 |
|
Rémi Gaillard
|
c56e8471c2
|
[-] BO: fix the checkbox of shop activation on modules configuration
|
2013-10-30 14:57:15 +01:00 |
|
gRoussac
|
8953c55b7f
|
[-] BO : Adminimport default customers group
|
2013-10-30 12:30:22 +01:00 |
|
Jérôme Nadaud
|
653c38e01a
|
Merge pull request #911 from madef/development
[-] BO : tagify call twice if field is not translatable
|
2013-10-30 00:55:53 -07:00 |
|
Madef
|
78af47e2d3
|
[-] BO : tagify call twice if field is not translatable
|
2013-10-29 23:18:34 +01:00 |
|
gRoussac
|
26b4fbf883
|
[*] BO : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/891 1/2
|
2013-10-29 19:07:31 +01:00 |
|
gRoussac
|
c98b5e0c78
|
[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski
|
2013-10-29 19:05:21 +01:00 |
|
Rémi Gaillard
|
6d5ca9969e
|
// js error
|
2013-10-29 17:56:29 +01:00 |
|
Gregory Roussac
|
90bef56c84
|
Merge pull request #907 from djfm/development
// Frenglish
|
2013-10-29 08:24:45 -07:00 |
|
gRoussac
|
75cde08776
|
// update conf message in AdminImport
|
2013-10-29 16:16:55 +01:00 |
|
gRoussac
|
c6319a754e
|
[-] BO : Stats are empty when no conversion rate
|
2013-10-29 16:04:15 +01:00 |
|
djfm
|
9d18ef8186
|
// Frenglish
|
2013-10-29 14:44:51 +00:00 |
|
Gregory Roussac
|
f58526c701
|
Merge pull request #905 from PhpMadman/RMARef
[-] BO : Order-follow displayed order id instead of order reference
|
2013-10-29 07:44:26 -07:00 |
|
Damien Metzger
|
d5eedd5eaa
|
Merge pull request #906 from djfm/development
// Small fix
|
2013-10-29 07:42:07 -07:00 |
|
gRoussac
|
a43851469e
|
[-] CORE : Currency conversion rate can not be 0
|
2013-10-29 15:39:17 +01:00 |
|
djfm
|
0288696c90
|
// English
|
2013-10-29 14:37:55 +00:00 |
|
Rémi Gaillard
|
64706075d5
|
// Fix default language on BO forms
|
2013-10-29 15:32:31 +01:00 |
|