 Rémi Gaillard
|
855c8a8de4
|
// add 2 useful hooks
|
2013-11-07 18:33:49 +01:00 |
|
|
Rémi Gaillard
|
f5c133f6e0
|
// small fix
|
2013-11-07 17:50:28 +01:00 |
|
|
Rémi Gaillard
|
2d609ec93c
|
// merge fixes
|
2013-11-07 17:43:26 +01:00 |
|
|
Rémi Gaillard
|
e3cfacb90e
|
// link to employee default tab and not index
|
2013-11-07 17:00:55 +01:00 |
|
|
Jerome Nadaud
|
01d8376ee7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 16:48:56 +01:00 |
|
|
Jerome Nadaud
|
b51b388eaa
|
// Blockcategories thumnail uploader fix
|
2013-11-07 16:44:55 +01:00 |
|
|
Jerome Nadaud
|
18718792be
|
// Uploader helper part 3
|
2013-11-07 16:42:00 +01:00 |
|
|
Jérôme Nadaud
|
75171c77dd
|
Merge pull request #940 from PhpMadman/bootstrap
// Fixes "Notice: Undefined index: nb_results in" when searching
|
2013-11-07 05:59:36 -08:00 |
|
|
PhpMadman
|
c6676197e5
|
// better syntax
|
2013-11-07 14:57:13 +01:00 |
|
|
PhpMadman
|
0a31ab8202
|
added check for empty value
|
2013-11-07 14:51:05 +01:00 |
|
|
Kevin Granger
|
63e31a4585
|
Merge pull request #939 from djfm/bootstrap
Translations (EN) / Mails / Fix Column
|
2013-11-07 05:08:16 -08:00 |
|
|
djfm
|
1bb550cf63
|
// allow hook exceptions on product comparison page
|
2013-11-07 13:01:54 +00:00 |
|
|
djfm
|
30624fabd2
|
Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap
|
2013-11-07 12:27:58 +00:00 |
|
|
djfm
|
598034efb4
|
// English
|
2013-11-07 12:27:48 +00:00 |
|
|
djfm
|
8cb761078b
|
// English
|
2013-11-07 12:26:55 +00:00 |
|
|
djfm
|
f83c50b264
|
// one is one
|
2013-11-07 11:08:15 +00:00 |
|
|
Vincent Augagneur
|
9e76f82fb5
|
//merge
|
2013-11-07 12:06:58 +01:00 |
|
|
Vincent Augagneur
|
3c31f1a07f
|
//dashconfig errors return
|
2013-11-07 12:05:03 +01:00 |
|
|
djfm
|
3af230118b
|
// English
|
2013-11-07 10:27:50 +00:00 |
|
|
Jerome Nadaud
|
c7249bcc84
|
// Done in 1.5.6.1
|
2013-11-07 11:05:39 +01:00 |
|
|
djfm
|
8ef9064355
|
Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap
|
2013-11-07 10:02:24 +00:00 |
|
|
djfm
|
3d22303b90
|
// sprintf
|
2013-11-07 10:01:10 +00:00 |
|
|
PhpMadman
|
2f1a82628c
|
// Fixes "Notice: Undefined index: nb_results in"
|
2013-11-07 09:00:00 +01:00 |
|
|
Kevin Granger
|
866e7f831b
|
// fixs highlight search
|
2013-11-06 19:26:22 +01:00 |
|
|
Kevin Granger
|
93717e910b
|
// Repairs sake of performance on tables with many lines.
|
2013-11-06 18:15:17 +01:00 |
|
|
djfm
|
1aadb10fb2
|
// English emails
|
2013-11-06 16:20:19 +00:00 |
|
|
Kevin Granger
|
df865eb827
|
Merge pull request #936 from TMMeilleur/bootstrap
// improved scss variables
|
2013-11-06 07:00:31 -08:00 |
|
|
Jerome Nadaud
|
616cc91eb2
|
// Fix bug JQuery on handler
|
2013-11-06 15:49:44 +01:00 |
|
|
Jerome Nadaud
|
56230a1f53
|
// Live is deprecated in jquery 1.9
|
2013-11-06 15:34:46 +01:00 |
|
|
Jerome Nadaud
|
7895f8643e
|
// Fix missing page header in combinations generator
|
2013-11-06 14:42:56 +01:00 |
|
|
TMMeilleur
|
211c36c7a3
|
improved scss variables
|
2013-11-06 15:41:00 +02:00 |
|
|
Jerome Nadaud
|
fcb225ac5a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-06 12:19:15 +01:00 |
|
|
Jerome Nadaud
|
0c1b77b3da
|
// Fix Combinations list actions button problem
|
2013-11-06 12:18:52 +01:00 |
|
|
Kevin Granger
|
05c71145c2
|
// dashboard
|
2013-11-06 12:14:49 +01:00 |
|
|
Vincent Augagneur
|
a890410a64
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-06 10:57:02 +01:00 |
|
|
Vincent Augagneur
|
c16c239953
|
//typo
|
2013-11-06 10:56:56 +01:00 |
|
|
Rémi Gaillard
|
9fa4296a06
|
Merge pull request #929 from djfm/bootstrap
// updated English emails: now responsive
|
2013-11-06 01:38:44 -08:00 |
|
|
Jérôme Nadaud
|
54db0b705c
|
Merge pull request #923 from PrestaEdit/1.6.x-fancybox
//remove unnecessary addCSS (fancybox)
|
2013-11-06 00:31:57 -08:00 |
|
|
Rémi Gaillard
|
1dd919addf
|
// no need mobile version with responsive :)
|
2013-11-05 19:15:24 +01:00 |
|
|
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 |
|