 gRoussac
|
d37f545058
|
[-] MO : Fix buig #PSCFV-10480 Blockcart too long cart_block_product_name
|
2013-09-23 17:26:36 +02:00 |
|
|
djfm
|
5c4de83e91
|
// no quotes around 1 in js=1 please
|
2013-09-23 15:20:26 +00: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 |
|
|
gRoussac
|
92382e347c
|
[-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page
|
2013-09-23 16:08:44 +02:00 |
|
|
Vincent Augagneur
|
0b35c5506c
|
//crossselling module now use boostrap design
|
2013-09-23 15:22:42 +02:00 |
|
|
gRoussac
|
dedc59f1db
|
[-] IN : FIX #PSCFV-10246 errors in stricts sql-mode, thanks @enumag
|
2013-09-23 15:17:15 +02:00 |
|
|
Vincent Augagneur
|
a2d770e04f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-23 15:10:49 +02:00 |
|
|
Vincent Augagneur
|
642ff59bef
|
//cheque module now use boostrap design
|
2013-09-23 15:10:46 +02:00 |
|
|
Damien Metzger
|
590e738254
|
// Fixed typo
|
2013-09-23 14:40:25 +02:00 |
|
|
Vincent Augagneur
|
e8420f24d1
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-23 14:19:12 +02:00 |
|
|
Jerome Nadaud
|
e128e17f4e
|
// Geoloc bootstrap design
|
2013-09-23 14:04:15 +02:00 |
|
|
Jerome Nadaud
|
748d6271a9
|
// Stores controller bootstrap
|
2013-09-23 13:56:30 +02:00 |
|
|
Jerome Nadaud
|
234b6de1b0
|
// Stores controller bootstrap design
|
2013-09-23 13:31:45 +02:00 |
|
|
Jerome Nadaud
|
4bb0a5f794
|
// Preferences images bootstrap design
|
2013-09-23 11:43:31 +02:00 |
|
|
Rémi Gaillard
|
c6222c51c8
|
// commit 6b47f5713e is missing
|
2013-09-23 11:36:15 +02:00 |
|
|
Fabio Chelly
|
a1555c3fc8
|
Merge remote-tracking branch 'origin/development' into development
|
2013-09-23 11:24:26 +02:00 |
|
|
Fabio Chelly
|
31697fde3c
|
[-] MO productcomments: confirmation message takes moderation mode into account
|
2013-09-23 11:24:14 +02:00 |
|
|
Jerome Nadaud
|
5206496f64
|
[-] BO : Fix Bug For new Fancy Box events
|
2013-09-23 11:22:51 +02:00 |
|
|
Jerome Nadaud
|
cf82157d47
|
// oops
|
2013-09-23 10:48:56 +02:00 |
|
|
Jerome Nadaud
|
7dbb6088a4
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-23 10:42:30 +02:00 |
|
|
Rémi Gaillard
|
50bbf1a547
|
// small fix
|
2013-09-23 10:46:41 +02:00 |
|
|
Jerome Nadaud
|
32a7a28567
|
[-] MO : FixBug #PNM-1683 - Treeview problem
|
2013-09-23 10:42:10 +02:00 |
|
|
Vincent Augagneur
|
12f67a825b
|
//carriercompare now use bootstrap design
|
2013-09-23 10:24:26 +02:00 |
|
|
Rémi Gaillard
|
a578cfb2e2
|
[-] FO: Fix #PSCFV-10461
|
2013-09-23 10:20:22 +02:00 |
|
|
Jerome Nadaud
|
f4e0f63ef7
|
// Add lingerie to activities list
|
2013-09-23 10:14:23 +02:00 |
|
|
Jerome Nadaud
|
45c7cb7757
|
// Cms categories list
|
2013-09-23 10:13:45 +02:00 |
|
|
Vincent Augagneur
|
39d84759a3
|
//blockviewed now use boostrap design
|
2013-09-23 10:06:43 +02:00 |
|
|
Vincent Augagneur
|
0fa8b4305e
|
//blocktags now use boostrap design
|
2013-09-23 10:03:28 +02:00 |
|
|
Vincent Augagneur
|
6e24fe1411
|
//blocksupplier now use bootstrap design
|
2013-09-23 09:52:58 +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 |
|
|
Vincent Augagneur
|
d71a6a90da
|
//now blockstore use bootstrap design
|
2013-09-23 09:48:59 +02:00 |
|
|
Vincent Augagneur
|
c1a9aa5936
|
//helper form input type file now can display thumb
|
2013-09-23 09:45:20 +02:00 |
|
|
Jerome Nadaud
|
67f05340c0
|
// Remove list header button link title and remove shop column center
|
2013-09-23 09:18:44 +02:00 |
|
|
Kevin Granger
|
c93eb9f40a
|
// orders WIP
|
2013-09-20 19:11:08 +02:00 |
|
|
Damien Metzger
|
214b844ef7
|
// Removed useless tiny mce src
|
2013-09-20 18:52:42 +02:00 |
|
|
Jerome Nadaud
|
0e87409bd6
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-20 18:31:47 +02:00 |
|
|
Jerome Nadaud
|
8e1cb5cc34
|
// Kpi update for customers orders
|
2013-09-20 18:31:35 +02:00 |
|
|
Damien Metzger
|
dadf83d6f6
|
[*] BO : removed deprecated chart engines
|
2013-09-20 18:27:35 +02:00 |
|
|
Damien Metzger
|
5c3b8015e5
|
[-] BO : fixed the redirection to a 404 page when loging in in the updater
|
2013-09-20 18:21:10 +02:00 |
|
|
Damien Metzger
|
1fe17f0eb1
|
// Removed deprecated option form in stats
|
2013-09-20 18:18:04 +02:00 |
|
|
Damien Metzger
|
ed1574e9ed
|
// Finished nvd3 chart
|
2013-09-20 18:12:10 +02:00 |
|
|
Damien Metzger
|
02e5913dd6
|
// Fixed potential warning
|
2013-09-20 18:12:10 +02:00 |
|
|
Vincent Augagneur
|
504485cef3
|
//blockspecials now use bootstrap design
|
2013-09-20 17:51:24 +02:00 |
|
|
Vincent Augagneur
|
4136697c5e
|
//blocksocial now use boostrap design
|
2013-09-20 17:22:15 +02:00 |
|
|
Vincent Augagneur
|
e332de1d50
|
//blockrss now use boostrap design
|
2013-09-20 17:14:50 +02:00 |
|
|
Jerome Nadaud
|
3ef36400bf
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-20 17:02:55 +02:00 |
|
|
Jerome Nadaud
|
c1e6df873d
|
// Fix birthday bootstrap design
|
2013-09-20 17:02:44 +02:00 |
|
|
Vincent Augagneur
|
24b6d3d387
|
//blockpaymentlogo now use boostrap design
|
2013-09-20 17:02:15 +02:00 |
|