 Damien Metzger
|
343c9578da
|
// Better
|
2013-10-31 17:15:30 +01:00 |
|
|
Damien Metzger
|
23e4e1badb
|
// I forgot the link
|
2013-10-31 17:10:15 +01:00 |
|
|
Damien Metzger
|
fe78dceede
|
// Fixed image sizes
|
2013-10-31 17:08:22 +01:00 |
|
|
Rémi Gaillard
|
c091729fd7
|
// missing directory
|
2013-10-31 17:03:41 +01:00 |
|
|
Rémi Gaillard
|
dc90450365
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-31 16:39:21 +01:00 |
|
|
Rémi Gaillard
|
a7ed5ee869
|
// cleaning
|
2013-10-31 16:39:01 +01:00 |
|
|
gRoussac
|
80c60be952
|
[-] BO : Do not enable rewrite url for index
|
2013-10-31 16:20:55 +01:00 |
|
|
Damien Metzger
|
3c1cdf4ef2
|
// Fixed new arrivals issue
|
2013-10-31 16:09:10 +01:00 |
|
|
Kevin Granger
|
ba28c5f527
|
// UI fixs
|
2013-10-31 15:49:57 +01:00 |
|
|
Damien Metzger
|
549fa9003c
|
// Small fix with URL rewrite
|
2013-10-31 15:41:41 +01:00 |
|
|
Damien Metzger
|
6c8e70f780
|
[*] FO : added "back to search results" the the product page
|
2013-10-31 15:32:52 +01:00 |
|
|
Rémi Gaillard
|
1b019dffc5
|
// Fix lang detection on dispatcher
|
2013-10-31 15:28:19 +01:00 |
|
|
Damien Metzger
|
f565b273d8
|
// Reverting the revert
|
2013-10-31 15:13:46 +01:00 |
|
|
Damien Metzger
|
9a1b45a8e6
|
// Fixed warning and prepared next commit
|
2013-10-31 15:09:14 +01:00 |
|
|
Damien Metzger
|
a97e3927df
|
Merge pull request #915 from TMMeilleur/bootstrap
// Theme update
|
2013-10-31 07:06:40 -07:00 |
|
|
TMMeilleur
|
68a98b29a6
|
tm theme
|
2013-10-31 15:51:25 +02:00 |
|
|
gRoussac
|
f9dc0b0252
|
[-] MO : Could not translate in transit mail, revert from https://github.com/viger-creator/PrestaShop/commit/3213b5dffb266ddb0639b94f72babd892328ffa2
|
2013-10-31 14:20:21 +01:00 |
|
|
Damien Metzger
|
ff2954b1d2
|
[*] FO : Changed category block behavior inside categories
|
2013-10-31 12:20:59 +01:00 |
|
|
Kevin Granger
|
534421fb6b
|
// UI fixs
|
2013-10-31 12:20:29 +01:00 |
|
|
Kevin Granger
|
03564fe0e5
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-31 11:34:58 +01:00 |
|
|
Kevin Granger
|
4334364b36
|
// cart rules > conditions > product rules
|
2013-10-31 11:34:47 +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
|
8a7f869515
|
// small graphical bug
|
2013-10-31 10:41:15 +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 |
|
|
Kevin Granger
|
09dcff959e
|
// cart rules > conditions > product rules WIP
|
2013-10-30 19:25:58 +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 https://github.com/PrestaShop/PrestaShop/commit/f78cde96d633f65ece5700d2bc9793f134bdb7e6
|
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 |
|
|
Rémi Gaillard
|
ecf45d0475
|
// small fix
|
2013-10-30 18:28:55 +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 |
|
|
Jerome Nadaud
|
9f2424db41
|
// Fix Module exception in transplant
|
2013-10-30 18:11:33 +01:00 |
|
|
djfm
|
a56fb7c639
|
// Polish installer translations
|
2013-10-30 17:06:52 +00:00 |
|
|
Rémi Gaillard
|
8aa369531e
|
// employee avatar
|
2013-10-30 18:02:10 +01: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 |
|
|
Vincent Augagneur
|
6a3e711cff
|
//small fix
|
2013-10-30 15:43:31 +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 |
|