 djfm
|
f742e817da
|
// updated English emails: now responsive
|
2013-11-05 18:10:31 +00:00 |
|
|
Rémi Gaillard
|
3edaee1313
|
// themeconfigurator
|
2013-11-05 19:07:42 +01:00 |
|
|
Rémi Gaillard
|
65a41a9f7a
|
// theme configurator
|
2013-11-05 18:49:21 +01:00 |
|
|
Kevin Granger
|
5ec5215919
|
// UI modules fixs
|
2013-11-05 18:17:39 +01:00 |
|
|
Vincent Augagneur
|
37e0556c36
|
//fixed carrier logo upload
|
2013-11-05 18:12:53 +01:00 |
|
|
Vincent Augagneur
|
871ebe77b6
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 18:08:22 +01:00 |
|
|
Vincent Augagneur
|
d27fe93daa
|
//modules added ->bootstrap = true;
|
2013-11-05 18:08:01 +01:00 |
|
|
Damien Metzger
|
a31dbeb68e
|
// Fixed bootstrap mode for modules
|
2013-11-05 17:29:51 +01:00 |
|
|
Kevin Granger
|
b68d8c5d4a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 17:15:51 +01:00 |
|
|
Kevin Granger
|
332101614a
|
// moved nv.d3.css to vendor directory
|
2013-11-05 17:15:36 +01:00 |
|
|
Vincent Augagneur
|
657c8f415a
|
//small css fix
|
2013-11-05 17:01:38 +01:00 |
|
|
Vincent Augagneur
|
3f3a4ef342
|
//revert
|
2013-11-05 16:58:26 +01:00 |
|
|
Vincent Augagneur
|
217a9124d4
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 16:56:08 +01:00 |
|
|
Vincent Augagneur
|
1dccee0036
|
//remove back button in header toolbar on carrier wizard
|
2013-11-05 16:56:03 +01:00 |
|
|
Damien Metzger
|
ad7dfca9e1
|
// RSS date on the dashboard
|
2013-11-05 16:55:55 +01:00 |
|
|
Kevin Granger
|
2581acd505
|
// fix tooltip carrier wizard
|
2013-11-05 16:52:41 +01:00 |
|
|
Kevin Granger
|
eb02711042
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 16:42:24 +01:00 |
|
|
Kevin Granger
|
e702af6a67
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/admin-theme.css
|
2013-11-05 16:42:09 +01:00 |
|
|
Damien Metzger
|
9f1911eeca
|
// Fixed shopping cart line reduction
|
2013-11-05 16:41:50 +01:00 |
|
|
Kevin Granger
|
533ebc0f6d
|
// backward CSS
|
2013-11-05 16:40:21 +01:00 |
|
|
Jerome Nadaud
|
3f3dc0feb9
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-05 16:39:12 +01:00 |
|
|
Rémi Gaillard
|
4a6cb5075e
|
Merge pull request #924 from TMMeilleur/bootstrap
// Update default theme
|
2013-11-05 07:36:14 -08:00 |
|
|
Damien Metzger
|
ec528fff93
|
// one more groups improvement
|
2013-11-05 16:34:03 +01:00 |
|
|
Vincent Augagneur
|
f0e1b9b2b8
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 16:32:12 +01:00 |
|
|
Vincent Augagneur
|
7e872aa581
|
//small fix
|
2013-11-05 16:32:05 +01:00 |
|
|
Damien Metzger
|
161c701ecf
|
// Groups review
|
2013-11-05 16:30:34 +01:00 |
|
|
TMMeilleur
|
0ffa6ab059
|
update 5.11.13
|
2013-11-05 17:27:57 +02:00 |
|
|
TMMeilleur
|
21209d799f
|
update 5.11.13
|
2013-11-05 17:17:26 +02:00 |
|
|
Damien Metzger
|
0bd6b940d2
|
// Fixed logoq
|
2013-11-05 16:17:14 +01:00 |
|
|
Damien Metzger
|
0e4a900d3d
|
// Fixed group display
|
2013-11-05 16:13:52 +01:00 |
|
|
Damien Metzger
|
e4fe5f6df6
|
// Fixed htmlentities in KPIs
|
2013-11-05 16:01:48 +01:00 |
|
|
Rémi Gaillard
|
161145fb34
|
// small fix
|
2013-11-05 15:35:14 +01:00 |
|
|
Rémi Gaillard
|
d4253b9849
|
// small fix
|
2013-11-05 15:33:21 +01:00 |
|
|
Damien Metzger
|
9bc5a52925
|
Merge pull request #916 from PrestaEdit/patch-58
[-] FO: use 4 images in thumbnails, not 3
|
2013-11-05 06:20:59 -08:00 |
|
|
Damien Metzger
|
b0ae53f823
|
// Changed cursor in the module position tab (for drag n drop)
|
2013-11-05 15:14:58 +01:00 |
|
|
Rémi Gaillard
|
b96da7e5ee
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 15:14:13 +01:00 |
|
|
Rémi Gaillard
|
a5bb0486e6
|
// fix email validator && allow to convert unicode without classes
|
2013-11-05 15:06:22 +01:00 |
|
|
Damien Metzger
|
9a86f2c32b
|
// And now it works!
|
2013-11-05 15:02:36 +01:00 |
|
|
Damien Metzger
|
a5552f3f85
|
// Improved dashgoals configuration (tmp)
|
2013-11-05 14:44:42 +01:00 |
|
|
Kevin Granger
|
eb383e580e
|
// Organize css/sass + backward compatibility WIP
|
2013-11-05 12:32:41 +01:00 |
|
|
fram
|
4b0b5cf4da
|
// added an option not to override the local localization pack when installing a localization pack
|
2013-11-05 12:08:14 +01:00 |
|
|
fram
|
2b8d069cf9
|
[*] LO : Added states to Spanish localization pack
|
2013-11-05 12:06:31 +01:00 |
|
|
Rémi Gaillard
|
9817ef6840
|
// small fix on profiling
|
2013-11-05 11:54:22 +01:00 |
|
|
gRoussac
|
581645ce6d
|
[-) BO : Action is mandatory for a cart rule
|
2013-11-05 11:26:10 +01:00 |
|
|
gRoussac
|
87be153e42
|
[-] MO : Blockcategories last_visited_category must not be cached
|
2013-11-05 11:16:52 +01:00 |
|
|
Gregory Roussac
|
f85c6b59c8
|
Merge pull request #921 from Jacky75/20131105-layered-feature-sorted
[*] MO : Blocklayered filter feature blocks sorted
|
2013-11-05 01:50:48 -08:00 |
|
|
Daniele Giachino
|
99e98a5164
|
In multistore, layered filters about categories are not loading the category name from the proper shop
|
2013-11-05 10:45:23 +01:00 |
|
|
TMMeilleur
|
55cd7c4c34
|
update 05.11.13
|
2013-11-05 11:35:24 +02:00 |
|
|
Vincent Augagneur
|
1a7aa020f6
|
//added new configuration on dashproduct
|
2013-11-05 10:23:26 +01:00 |
|
|
Damien Metzger
|
4c1ad83b18
|
// "Fixed" strict standard
|
2013-11-05 10:22:39 +01:00 |
|