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
gRoussac
7eb70486e0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-08 15:54:28 +01:00
gRoussac
ebc3dfee62
[-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index
2013-11-08 15:54:13 +01:00
Gregory Roussac
ee487fde59
Merge pull request #953 from Shagshag/patch-4
...
[*] BO: kb was not translatable
2013-11-08 06:37:26 -08:00
Shagshag
c7f1fcb49a
kb was not translatable
2013-11-08 15:33:49 +01:00
gRoussac
530b6dc501
// Productscomments remove warnings
2013-11-08 15:00:56 +01:00
gRoussac
5364be686e
// More simple names for csv import files
2013-11-08 14:59:43 +01:00
Jérôme Nadaud
aaaf8588c1
Merge pull request #931 from PhpMadman/patch-2
...
[-] MO : Mailalert was not using order reference
2013-11-08 04:01:39 -08:00
PhpMadman
6ee2852fa5
[-] MO : Mailalert was not using order reference
2013-11-08 12:48:49 +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
02acd47c9e
Merge pull request #950 from pelTek/patch-2
...
Added states to Greek localization pack
2013-11-08 02:46:55 -08:00
Jérôme Nadaud
6f70c77d41
Merge pull request #949 from djfm/bootstrap
...
// sprintf & English
2013-11-08 02:45:04 -08:00
Chris
32e92762f5
Added states to Greek localization pack
...
Added states to Greek localization pack
2013-11-08 12:44:42 +02:00
fram
be38a438e2
// sprintf & English
2013-11-08 11:39:59 +01:00
Francois Gaillard
3b7387ffe8
[-] Classes : Hook - Installer & context shop id
2013-11-08 11:00:14 +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
gRoussac
472dc8c27d
[-] MO : Blocklayered follow up https://github.com/PrestaShop/PrestaShop/commit/a6e67b078e067445eef358e907649e843a1dc26a#commitcomment-4538556
2013-11-07 17:59:04 +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
Javsmile
99ad6481e6
Update productcomments.php
...
This little addition fix the problem for enlight the stars in the hookproductTab whe you disable or make an exception of the hookproductOutOfStock with the product file.
2013-11-07 17:53:47 +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
Fabio Chelly
92cf31e5c3
[-] MO : Fixed #PNM-1600 by modifying getPageLink()
2013-11-07 16:46:30 +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
Fabio Chelly
fa7d44d67f
Merge remote-tracking branch 'origin/development' into development
2013-11-07 16:39:26 +01:00
Fabio Chelly
b9c4b5d2a7
[-] FO : Prevents warning in safePostVars when $_POST has been unset
2013-11-07 16:38:53 +01:00
Gregory Roussac
fbd28f3e49
Merge pull request #942 from Jacky75/20131107_payment_and_groups
...
[-] FO : in multistore payment module restrictions by customer group was...
2013-11-07 06:39:57 -08:00
Daniele Giachino
8c8340db4e
[-] FO : in multistore payment module restrictions by customer group was not applied to specific shop
2013-11-07 15:18:59 +01:00
gRoussac
7cc351e83d
[-] BO : Fix bug #PSCFV-10932, ranges input disabled on load
2013-11-07 15:11:30 +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
Jerome Nadaud