 Jerome Nadaud
|
ec37efdf8b
|
// Add identifier name
|
2013-11-12 11:30:01 +01:00 |
|
|
Jerome Nadaud
|
94817a9371
|
// ooops
|
2013-11-12 11:16:31 +01:00 |
|
|
Jerome Nadaud
|
db0e1e41a9
|
// Small Fix
|
2013-11-12 11:10:55 +01:00 |
|
|
Kevin Granger
|
3f83edc7e1
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-12 11:07:44 +01:00 |
|
|
Kevin Granger
|
4a6346b295
|
// adjustment on switch
|
2013-11-12 11:07:30 +01:00 |
|
|
Jerome Nadaud
|
41196f3c5f
|
// General modification for view and edit title
|
2013-11-12 11:06:20 +01:00 |
|
|
Jerome Nadaud
|
44d1ed0982
|
// Add category name to page header title
|
2013-11-12 10:45:17 +01:00 |
|
|
Kevin Granger
|
2a982e96f1
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-12 10:44:08 +01:00 |
|
|
Kevin Granger
|
5ca23d44a6
|
// label with tooltip
|
2013-11-12 10:43:52 +01:00 |
|
|
Jerome Nadaud
|
3931914203
|
// Add Modernizr and Modernizr-loads check and loading for unsuported browsers
|
2013-11-12 09:54:20 +01:00 |
|
|
Rémi Gaillard
|
d7dd85d7d0
|
Merge pull request #955 from alexey-svistunov/bootstrap
Added changes from eb94b51 TMMeilleur/PrestaShop
|
2013-11-08 11:25:25 -08:00 |
|
|
alexey-svistunov
|
6f5c9044d3
|
Added changes from eb94b51 TMMeilleur/PrestaShop
|
2013-11-08 21:00:00 +02:00 |
|
|
Kevin Granger
|
d3100acef2
|
// fixs on mobile nav
|
2013-11-08 18:31:07 +01:00 |
|
|
Jerome Nadaud
|
c5b3d20b96
|
// Fix empty file list on add
|
2013-11-08 18:05:56 +01:00 |
|
|
Jerome Nadaud
|
bdc996d13b
|
// Wrong col size
|
2013-11-08 17:58:09 +01:00 |
|
|
Jerome Nadaud
|
a3082be2db
|
// Remove unnecessary function
|
2013-11-08 17:53:26 +01:00 |
|
|
Jerome Nadaud
|
217a79eeae
|
// Unify thumb param in files options
|
2013-11-08 17:49:56 +01:00 |
|
|
Jerome Nadaud
|
ef469d7782
|
// Move spin and ladda js to products controller
|
2013-11-08 17:47:09 +01:00 |
|
|
Jerome Nadaud
|
9065a73998
|
// Remove flags
|
2013-11-08 17:21:36 +01:00 |
|
|
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 |
|