 djfm
|
52622e6be2
|
// English
|
2013-10-23 15:33:15 +00:00 |
|
|
Jerome Nadaud
|
7fbf6c7de0
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 13:45:50 +02:00 |
|
|
Jerome Nadaud
|
e53e63c257
|
// Add Back button to list footer
|
2013-10-21 13:45:39 +02:00 |
|
|
gRoussac
|
7c7fe5dc0b
|
// small change
|
2013-10-21 12:39:48 +02:00 |
|
|
Jerome Nadaud
|
53a7b75d7a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 12:36:02 +02:00 |
|
|
Jerome Nadaud
|
101df4c0b9
|
// Add check list filters value
|
2013-10-21 12:35:57 +02:00 |
|
|
Kevin Granger
|
957f9f0467
|
// categories group
|
2013-10-21 12:21:35 +02:00 |
|
|
Jerome Nadaud
|
b141975d57
|
// Fix fields_list check
|
2013-10-21 11:49:08 +02:00 |
|
|
Jerome Nadaud
|
9c4b975cfc
|
//Module uploader bootstraping
|
2013-10-21 11:31:50 +02:00 |
|
|
Jerome Nadaud
|
693a2aa8ff
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 11:25:05 +02:00 |
|
|
Jerome Nadaud
|
81042db718
|
// CSV import uploader bootstraping
|
2013-10-21 11:24:56 +02:00 |
|
|
Vincent Augagneur
|
9cf2fe4214
|
//removed commented code
|
2013-10-21 10:24:20 +02:00 |
|
|
Vincent Augagneur
|
459d0232a4
|
//blockcms use boostrap design
|
2013-10-21 10:08:45 +02:00 |
|
|
Vincent Augagneur
|
e058224cf2
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 09:58:18 +02:00 |
|
|
Vincent Augagneur
|
103582be33
|
//blocklink now use bootstrap design
|
2013-10-21 09:58:08 +02:00 |
|
|
Jerome Nadaud
|
6275e7bcad
|
// Remove translations on icon class
|
2013-10-21 09:57:13 +02:00 |
|
|
Kevin Granger
|
a5ca6f11a7
|
// css email
|
2013-10-21 09:51:46 +02:00 |
|
|
Vincent Augagneur
|
fd86a29c5c
|
//small fix
|
2013-10-21 09:50:20 +02:00 |
|
|
Kevin Granger
|
1f02bcaa75
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-18 19:07:15 +02:00 |
|
|
Kevin Granger
|
067eecdc70
|
// small fix
|
2013-10-18 19:07:03 +02:00 |
|
|
Jerome Nadaud
|
cdab5ed6c9
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
|
2013-10-18 18:47:42 +02:00 |
|
|
Jerome Nadaud
|
7e176b157b
|
// Fix save and preview button
|
2013-10-18 18:44:13 +02:00 |
|
|
Kevin Granger
|
04b4e548f3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-18 18:38:17 +02:00 |
|
|
Kevin Granger
|
5f52a9e171
|
// fix products
|
2013-10-18 18:38:02 +02:00 |
|
|
Damien Metzger
|
d1a2c33322
|
Merge pull request #849 from djfm/bootstrap
// Translations fix
|
2013-10-18 09:35:20 -07:00 |
|
|
Jerome Nadaud
|
6c37efdb6a
|
// Categories image upload bootstraping
|
2013-10-18 18:33:32 +02:00 |
|
|
Jerome Nadaud
|
ff81667b5c
|
// Image thumnail fix
|
2013-10-18 18:28:57 +02:00 |
|
|
Jerome Nadaud
|
667353d43f
|
// Store contacts bootstraping
|
2013-10-18 18:24:21 +02:00 |
|
|
Jerome Nadaud
|
1c1fb5fb5c
|
// Update image fix
|
2013-10-18 17:59:45 +02:00 |
|
|
Jerome Nadaud
|
ed2546d07c
|
// Define language dir constant
|
2013-10-18 17:59:34 +02:00 |
|
|
Jerome Nadaud
|
1bee0087c0
|
// Update image fix
|
2013-10-18 17:50:36 +02:00 |
|
|
Jerome Nadaud
|
964f546b0b
|
// Update image when updated
|
2013-10-18 17:41:36 +02:00 |
|
|
Jerome Nadaud
|
0599d4f056
|
// Fix Localization page header title
|
2013-10-18 17:41:10 +02:00 |
|
|
Jerome Nadaud
|
785fe814bc
|
// Define Order state dir constante
|
2013-10-18 17:40:49 +02:00 |
|
|
Jerome Nadaud
|
ac112c38df
|
// File imput improvement
|
2013-10-18 17:32:29 +02:00 |
|
|
Damien Metzger
|
9dfecbb1b8
|
// Fixed addons url
|
2013-10-18 17:05:04 +02:00 |
|
|
djfm
|
5a3d487e9f
|
// sprintf again
|
2013-10-18 14:31:48 +00:00 |
|
|
djfm
|
d097679ea0
|
// improvements to producttooltip texts
|
2013-10-18 14:16:17 +00:00 |
|
|
djfm
|
b5b18b9d2b
|
// use sprintf
|
2013-10-18 13:55:30 +00:00 |
|
|
Rémi Gaillard
|
23abf712ec
|
// missing files
|
2013-10-18 15:53:05 +02:00 |
|
|
Rémi Gaillard
|
d61d2b6627
|
// rm 1.4 controllers - RIP
|
2013-10-18 15:50:12 +02:00 |
|
|
djfm
|
06b80701c0
|
// labels
|
2013-10-18 13:04:49 +00:00 |
|
|
djfm
|
f31eb37f37
|
// improved translations in carriercompare
|
2013-10-18 12:53:16 +00:00 |
|
|
djfm
|
3e687cd533
|
// improved some messages
|
2013-10-18 12:17:23 +00:00 |
|
|
Damien Metzger
|
316f10a352
|
// Changed calibration of the dashboard chart
|
2013-10-18 12:15:37 +02:00 |
|
|
Damien Metzger
|
1cd9ceca35
|
// Compare data on the chart
|
2013-10-18 12:10:06 +02:00 |
|
|
Damien Metzger
|
d6235bdacc
|
// Cannot use analytics real time at this time since it is in private beta
|
2013-10-18 10:54:03 +02:00 |
|
|
djfm
|
901f5aeb08
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-18 08:20:32 +00:00 |
|
|
djfm
|
37656c2df9
|
// fixed improper English string for translation
|
2013-10-18 08:20:20 +00:00 |
|
|
Kevin Granger
|
e17c5f7c91
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 18:43:31 +02:00 |
|