 Kevin Granger
|
00a72a5f68
|
// skin uploader button
|
2013-11-08 16:56:12 +01:00 |
|
|
Jerome Nadaud
|
5afe733e13
|
// Small fix on HelperUploader
|
2013-11-08 16:53:32 +01:00 |
|
|
Jerome Nadaud
|
bf67bd56a3
|
// Add uploader to products controller
|
2013-11-08 16:29:07 +01:00 |
|
|
Kevin Granger
|
034565bc6a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-08 16:18:38 +01:00 |
|
|
Kevin Granger
|
b214ea68ff
|
// mobile nav
|
2013-11-08 16:18:28 +01:00 |
|
|
Jérôme Nadaud
|
64c166c311
|
Merge pull request #947 from PhpMadman/Boot-UpTo
// made a working You Save column for Volume Discounts
|
2013-11-08 02:57:23 -08:00 |
|
|
Jérôme Nadaud
|
6f70c77d41
|
Merge pull request #949 from djfm/bootstrap
// sprintf & English
|
2013-11-08 02:45:04 -08:00 |
|
|
fram
|
be38a438e2
|
// sprintf & English
|
2013-11-08 11:39:59 +01:00 |
|
|
PhpMadman
|
1782bc082f
|
// made a working You Save column for Volume Discounts
|
2013-11-08 10:27:36 +01:00 |
|
|
Kevin Granger
|
42af175d22
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 21:49:11 +01:00 |
|
|
Kevin Granger
|
9c4ee27f20
|
// mobile nav WIP
|
2013-11-07 21:48:55 +01:00 |
|
|
Kevin Granger
|
402221ad0f
|
// load enquire.js
|
2013-11-07 21:48:17 +01:00 |
|
|
Rémi Gaillard
|
2d2445efd4
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 18:34:09 +01:00 |
|
|
Rémi Gaillard
|
855c8a8de4
|
// add 2 useful hooks
|
2013-11-07 18:33:49 +01:00 |
|
|
Jerome Nadaud
|
4d1a4393a9
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 17:58:32 +01:00 |
|
|
Jerome Nadaud
|
8a4c036655
|
// Fix cache problem
|
2013-11-07 17:58:17 +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 |
|
|
Kevin Granger
|
51e962195c
|
// This Controller needs a toolbar and a title
|
2013-11-07 17:15:40 +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
|
3eb9a7e772
|
// update bootstrap + add enquire.js
|
2013-11-07 14:19:23 +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 |
|