 Jerome Nadaud
|
3931914203
|
// Add Modernizr and Modernizr-loads check and loading for unsuported browsers
|
2013-11-12 09:54:20 +01:00 |
|
|
Gregory Roussac
|
cd83ec93c7
|
Merge pull request #961 from joseantgv/patch-4
[-] MO : Whishlist, innerhtml in html jquery
|
2013-11-12 00:42:04 -08:00 |
|
|
fram
|
ab730dc3da
|
// do not use sprintf when it is useless
|
2013-11-12 09:21:05 +01:00 |
|
|
joseantgv
|
7523828a7a
|
Update ajax-wishlist.js
innerHtml can not execute javascript from "data". If someone modify php files returned from jquery function and includes a script, it's not executed.
|
2013-11-11 16:58:52 +01:00 |
|
|
gRoussac
|
e2d8a33a81
|
[*] FO : Cache on getDiscountsCustomer, follow up https://github.com/PrestaShop/PrestaShop/pull/960
|
2013-11-11 14:02:11 +01:00 |
|
|
gRoussac
|
a7869a1f06
|
[*] CORE : Remove duplicate SQL queries
|
2013-11-11 13:41:23 +01:00 |
|
|
Alexey Svistunov
|
97d14e5b08
|
Added changes from commit 88aa49e TMMeilleur
|
2013-11-11 11:30:24 +02:00 |
|
|
gRoussac
|
de404706d9
|
[*] CORE : Profiling hide non doubles
|
2013-11-11 02:09:50 +01:00 |
|
|
gRoussac
|
3f9338e13d
|
[*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop
|
2013-11-11 01:59:10 +01:00 |
|
|
gRoussac
|
38da826671
|
[-] FO : getTaxCalculator bad cache key again // sorry about that
|
2013-11-11 01:37:20 +01:00 |
|
|
gRoussac
|
fee461fdf1
|
[*] FO : Set cache for StockAvailable::getQuantityAvailableByProduct
|
2013-11-11 01:00:55 +01:00 |
|
|
gRoussac
|
8dd951c2df
|
[*] MO : Remove calls to isRegisteredInHook in crossselling and productscategory
|
2013-11-11 00:36:17 +01:00 |
|
|
gRoussac
|
7e93b2cffd
|
[-] FO : getTaxCalculator bad cache key
|
2013-11-11 00:13:35 +01:00 |
|
|
gRoussac
|
19da345531
|
[-] BO : Could not check all modules after ajax call
|
2013-11-10 21:51:14 +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 |
|
|
Fabio Chelly
|
bd8eebdc33
|
Merge remote-tracking branch 'origin/development' into development
|
2013-11-08 18:12:23 +01:00 |
|
|
Fabio Chelly
|
4312d241f3
|
[-] MO :Fixed #PNM-1654 (Loyalty module) by using most expensive attribute instead of default one
|
2013-11-08 18:12:11 +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 |
|
|
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 |
|