 Damien Metzger
|
4fe4d71361
|
// Stats cleaning
|
2013-10-29 15:29:55 +01:00 |
|
|
PhpMadman
|
7c1623c7fa
|
[-] BO : Order-follow displayed order id instead of order reference
|
2013-10-29 14:53:50 +01:00 |
|
|
Damien Metzger
|
f06eb84d9f
|
// Stats cleaning
|
2013-10-29 14:36:27 +01:00 |
|
|
Jérôme Nadaud
|
ed2fbba996
|
Merge pull request #903 from PhpMadman/patch-2
[-] BO : hide stmp options when selecting never send emails
|
2013-10-29 05:31:02 -07:00 |
|
|
PhpMadman
|
87bb957431
|
fixed missing comma
|
2013-10-29 13:28:00 +01:00 |
|
|
PhpMadman
|
7b029457e4
|
[-] BO : hide stmp options when selecting never send emails
|
2013-10-29 12:41:24 +01:00 |
|
|
Jerome Nadaud
|
b605f33359
|
[-] BO : FixBug #PSCFV-10866 - Tagify system not working
|
2013-10-29 12:07:30 +01:00 |
|
|
Jerome Nadaud
|
580e201c48
|
[-] BO : FixBug #PSCFV-9319 - display only valid order id
|
2013-10-29 11:38:48 +01:00 |
|
|
gRoussac
|
d409614222
|
[-] FO : CustomerMessage ip_address to string
|
2013-10-29 11:18:53 +01:00 |
|
|
Damien Metzger
|
dabb23ac8d
|
// Added KPIs to the category page and fixed dashboard data
|
2013-10-29 11:03:09 +01:00 |
|
|
djfm
|
e1c7541a38
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-10-29 10:01:00 +00:00 |
|
|
gRoussac
|
1bee84d26c
|
[-] BO : Do not delete other default jpg when _deleteOldImages and type defined
|
2013-10-29 10:57:33 +01:00 |
|
|
gRoussac
|
af61191a7e
|
// rename field Action when out of stock
|
2013-10-29 10:55:46 +01:00 |
|
|
Rémi Gaillard
|
07222be5dd
|
// demo mode on ajaxfilemanager
|
2013-10-29 10:53:00 +01:00 |
|
|
Kevin Granger
|
b3d7b8754b
|
// fixs date range picker Wip
|
2013-10-29 10:40:33 +01:00 |
|
|
Jerome Nadaud
|
9f2580f3bd
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-10-29 10:31:12 +01:00 |
|
|
Jerome Nadaud
|
d2e475dd3a
|
// Removed line from merge
|
2013-10-29 10:30:59 +01:00 |
|
|
Rémi Gaillard
|
2b67d7072c
|
// type of logger field
|
2013-10-29 10:18:29 +01:00 |
|
|
Gregory Roussac
|
b885c63564
|
Merge pull request #900 from kpodemski/patch-10
[*] MO: productcomments optimization
|
2013-10-29 02:06:56 -07:00 |
|
|
Gregory Roussac
|
d74291e5b5
|
Merge pull request #901 from kpodemski/patch-11
[*] MO: blocksharefb optimization
|
2013-10-29 02:06:25 -07:00 |
|
|
Jerome Nadaud
|
1d90218e0d
|
// Update mailalert module version
|
2013-10-29 10:00:57 +01:00 |
|
|
Jerome Nadaud
|
9660cef0aa
|
[-] MO : mailalert - Fix deprecated warning on displayDate
|
2013-10-29 09:58:42 +01:00 |
|
|
Jérôme Nadaud
|
4b1f198cc4
|
Merge pull request #899 from cedricfontaine/patch-3
Update stores.js
|
2013-10-29 01:43:03 -07:00 |
|
|
gRoussac
|
0aca1d4a67
|
[*] BO : AdminProducts find smallest images
|
2013-10-29 08:47:41 +01:00 |
|
|
Krystian Podemski
|
526f32b6a0
|
[*] MO: blocksharefb optimization
|
2013-10-28 23:24:32 +01:00 |
|
|
Krystian Podemski
|
faa4a18a82
|
[*] MO: productcomments optimization
|
2013-10-28 23:21:35 +01:00 |
|
|
gRoussac
|
79cba4b655
|
[-] FO : Fix bug #PSCFV-10851, no shop restriction in vouchers display in cart
|
2013-10-28 19:00:00 +01:00 |
|
|
cedricfontaine
|
0ba8fbc39a
|
Update stores.js
Phone number is already in the address field
|
2013-10-28 13:46:42 -04:00 |
|
|
Rémi Gaillard
|
edf54eb2ca
|
// re-generate class_index on the first step of install
|
2013-10-28 18:43:02 +01:00 |
|
|
Jerome Nadaud
|
dd10301413
|
// Fix tagify key events
|
2013-10-28 17:46:00 +01:00 |
|
|
gRoussac
|
e86c56172d
|
[*] FO: Can not establish purchase total when tax incl.
|
2013-10-28 17:42:23 +01:00 |
|
|
Jerome Nadaud
|
38f034f4e0
|
// Remove header and footer display when ajax
|
2013-10-28 17:10:53 +01:00 |
|
|
Jerome Nadaud
|
a466c6f5f7
|
// Add tagify system to product information
|
2013-10-28 16:32:17 +01:00 |
|
|
Kevin Granger
|
3798adff2f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-28 16:19:02 +01:00 |
|
|
Kevin Granger
|
d523d739e7
|
// dashboard date range picker wip
|
2013-10-28 16:18:43 +01:00 |
|
|
Jerome Nadaud
|
5760718b85
|
// Add Save button to page header toolbar
|
2013-10-28 15:55:58 +01:00 |
|
|
Rémi Gaillard
|
1454a0d26a
|
// search type in BO
|
2013-10-28 15:32:26 +01:00 |
|
|
Jerome Nadaud
|
48b7a49b1a
|
// Product image upload failed with bad content-type header
|
2013-10-28 14:58:19 +01:00 |
|
|
Gregory Roussac
|
12a257db7a
|
Merge pull request #898 from Jacky75/blulab20131028-slider-virtualuri
[-] MO : homeslider stores slider about multistore with virtual uri
|
2013-10-28 06:53:41 -07:00 |
|
|
Sarah Lorenzini
|
63141a9c4d
|
[-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden.
|
2013-10-28 14:48:48 +01:00 |
|
|
Daniele Giachino
|
c84689ec71
|
homeslider stores slider about multistore with virtual uri
|
2013-10-28 14:09:35 +01:00 |
|
|
Damien Metzger
|
0aea146a4c
|
// Code cleaning stats modules
|
2013-10-28 13:39:39 +01:00 |
|
|
Damien Metzger
|
9c54dcce66
|
// Fixed default stats graph engine
|
2013-10-28 12:15:35 +01:00 |
|
|
Damien Metzger
|
08732eda50
|
// Fixed default selection in the stats submenu
|
2013-10-28 12:08:46 +01:00 |
|
|
Damien Metzger
|
b6799d4f2f
|
[*] BO : download attachments directly from the list
|
2013-10-28 11:57:40 +01:00 |
|
|
gRoussac
|
4103339f53
|
[-] BO : AdminImport, fix bug from https://github.com/indesign47/PrestaShop/commit/84454bbc1c7a315e232245c5e43b300b8f153473#commitcomment-4418502
|
2013-10-28 11:21:25 +01:00 |
|
|
Gregory Roussac
|
9a879bc133
|
Merge pull request #897 from freedayko/development
[*] BO : improved unicode characters replacement in URLs
|
2013-10-28 03:09:16 -07:00 |
|
|
Damien Metzger
|
79b7521cac
|
Merge pull request #892 from djfm/bootstrap
// small fixes in English Email php templates
|
2013-10-28 02:21:50 -07:00 |
|
|
Kevin Granger
|
7126397bfe
|
// fix scroll vertical nav
|
2013-10-28 10:13:35 +01:00 |
|
|
djfm
|
4f8d153469
|
// fixed links in new English mails
|
2013-10-28 08:57:59 +00:00 |
|