 Fabio Chelly
|
4f639329e9
|
Merge remote-tracking branch 'origin/development' into development
|
2013-09-20 10:47:17 +02:00 |
|
|
Fabio Chelly
|
91ae972655
|
[-] MO mailalert : products alerts can be registered for multiple guests
#PNM-1669
|
2013-09-20 10:46:56 +02:00 |
|
|
Jerome Nadaud
|
74a262f2ed
|
// Shopping carts bootsrap design
|
2013-09-20 10:29:32 +02:00 |
|
|
Damien Metzger
|
f8ca06d927
|
// Better cache depth management for smarty
|
2013-09-20 10:26:58 +02:00 |
|
|
Damien Metzger
|
eb6600e840
|
// Blockcustomerprivacy should not be installed by default
|
2013-09-20 10:26:58 +02:00 |
|
|
Gregory Roussac
|
14cd72121a
|
Merge pull request #732 from Ha99y/20130919_X-Robots
[*] CORE : Send noindex header to avoid ghost carts by bots
|
2013-09-20 00:52:49 -07:00 |
|
|
ha99y
|
42cdc988ac
|
Send noindex header to avoid ghost carts by bots
|
2013-09-19 22:15:00 -07:00 |
|
|
Kevin Granger
|
724ab12122
|
// orders cleanup
|
2013-09-19 20:12:05 +02:00 |
|
|
Jerome Nadaud
|
660bb870cc
|
// Add tooltip to list header toolbar button
|
2013-09-19 19:45:21 +02:00 |
|
|
Jerome Nadaud
|
c0fa5f8f79
|
// Fix hint in options.tpl
|
2013-09-19 19:39:46 +02:00 |
|
|
Jerome Nadaud
|
39edb5a546
|
// Fix cart rules bootstrap design
|
2013-09-19 19:33:55 +02:00 |
|
|
Jerome Nadaud
|
9b308ae7fc
|
// Fix Translatable field on cart rule information
|
2013-09-19 19:01:43 +02:00 |
|
|
Jerome Nadaud
|
e1a3440145
|
// Add array for hint and desc for options.tpl
|
2013-09-19 18:56:35 +02:00 |
|
|
Jerome Nadaud
|
b40b9ec328
|
// Fix Permissions
|
2013-09-19 18:26:42 +02:00 |
|
|
Jerome Nadaud
|
e6780f7a86
|
// Fix menu list position col
|
2013-09-19 18:08:20 +02:00 |
|
|
Jerome Nadaud
|
f8fed30b44
|
// Prevent enter key event propagation for search input
|
2013-09-19 18:07:50 +02:00 |
|
|
Damien Metzger
|
33405ed858
|
// Rollback file wrongly modified by previous commit
|
2013-09-19 17:57:29 +02:00 |
|
|
Damien Metzger
|
cda7b225e2
|
// Removed deprecated module
|
2013-09-19 17:57:29 +02:00 |
|
|
Jerome Nadaud
|
2e80f00ba2
|
// Remove console log
|
2013-09-19 17:39:11 +02:00 |
|
|
Jerome Nadaud
|
48d7e43f1c
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-19 17:38:19 +02:00 |
|
|
Jerome Nadaud
|
6f483a87a9
|
// Fix hide language on ajax load
|
2013-09-19 17:38:07 +02:00 |
|
|
Sarah Lorenzini
|
550f6c190b
|
// update stats tabs
|
2013-09-19 17:36:27 +02:00 |
|
|
Francois Gaillard
|
8c6aaa3c7d
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-19 17:31:42 +02:00 |
|
|
Francois Gaillard
|
63f4743134
|
[-] MO : PNM-1715 - Bug fix accented chars & ajax-cart
|
2013-09-19 17:31:35 +02:00 |
|
|
gRoussac
|
e0b59082f9
|
[-] BO : Issue with domready on adminImport
|
2013-09-19 17:19:51 +02:00 |
|
|
Vincent Augagneur
|
97cff2210f
|
//removed unused code
|
2013-09-19 17:01:20 +02:00 |
|
|
Vincent Augagneur
|
53e046c4b5
|
//removed unused code
|
2013-09-19 17:00:50 +02:00 |
|
|
gRoussac
|
0361d5db8d
|
[-] BO : do not reaffect import_type for categories
|
2013-09-19 16:59:04 +02:00 |
|
|
Kevin Granger
|
f222bb7b7f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-19 16:58:12 +02:00 |
|
|
Kevin Granger
|
650001024a
|
// orders cleanup
|
2013-09-19 16:55:06 +02:00 |
|
|
Vincent Augagneur
|
2b2b502ba2
|
//blockbestsellers && bankwire now use displayError & displayConfirmation
|
2013-09-19 16:55:04 +02:00 |
|
|
Vincent Augagneur
|
150b68b96b
|
//displayError & displayConfirmation use bootstrap design
|
2013-09-19 16:52:58 +02:00 |
|
|
Vincent Augagneur
|
a5642d43a3
|
//blockbestsellers module configuration is now using bootstrap design
|
2013-09-19 16:47:51 +02:00 |
|
|
Vincent Augagneur
|
ef063db2f0
|
//bankwire module configuration is now using bootstrap design
|
2013-09-19 16:39:22 +02:00 |
|
|
gRoussac
|
ea6ea955bb
|
// licence
|
2013-09-19 16:39:21 +02:00 |
|
|
gRoussac
|
803b6ce8ec
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Conflicts:
controllers/admin/AdminImportController.php
|
2013-09-19 16:38:01 +02:00 |
|
|
gRoussac
|
0c511dead5
|
[*] FIX #PSCFV-8106 do not regenerate thumbnails if not
|
2013-09-19 16:28:19 +02:00 |
|
|
Jerome Nadaud
|
33943ef66a
|
// Date range filter
|
2013-09-19 16:23:26 +02:00 |
|
|
Vincent Augagneur
|
d1a35838cf
|
//small fix
|
2013-09-19 16:09:53 +02:00 |
|
|
Jerome Nadaud
|
3b465111b9
|
// Customer group
|
2013-09-19 15:57:28 +02:00 |
|
|
Jerome Nadaud
|
15622fbf45
|
// Customers group
|
2013-09-19 14:25:17 +02:00 |
|
|
Jerome Nadaud
|
cd627113b6
|
// Some fix
|
2013-09-19 12:13:24 +02:00 |
|
|
Kevin Granger
|
d735496159
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-19 12:09:34 +02:00 |
|
|
Kevin Granger
|
be8f728b2a
|
// orders
|
2013-09-19 12:09:25 +02:00 |
|
|
Jerome Nadaud
|
eb1531a0b3
|
// Fix textlang size and textarea input group
|
2013-09-19 11:23:09 +02:00 |
|
|
Jerome Nadaud
|
c23f01cdc8
|
// Attributes Groups view
|
2013-09-19 10:48:16 +02:00 |
|
|
Rémi Gaillard
|
6b47f5713e
|
// another fix for multishop fields in context all on product page
|
2013-09-19 09:48:46 +02:00 |
|
|
Rémi Gaillard
|
5eb4c93b8c
|
[-] BO: Bad id for multishop checkbox on admin products - weird bug with active flag #PSCFV-9935
|
2013-09-18 19:35:56 +02:00 |
|
|
djfm
|
0a9f425281
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 16:08:44 +00:00 |
|
|
djfm
|
65559c5cf4
|
// small improvement to Brazilian translations
|
2013-09-18 16:08:23 +00:00 |
|