 Rémi Gaillard
|
b9ad576fb0
|
// -> mailsrc branch
|
2013-10-30 15:02:06 +01:00 |
|
|
Rémi Gaillard
|
f9b1545037
|
// missing file
|
2013-10-30 14:59:08 +01:00 |
|
|
Rémi Gaillard
|
c56e8471c2
|
[-] BO: fix the checkbox of shop activation on modules configuration
|
2013-10-30 14:57:15 +01:00 |
|
|
gRoussac
|
8953c55b7f
|
[-] BO : Adminimport default customers group
|
2013-10-30 12:30:22 +01:00 |
|
|
Vincent Augagneur
|
ad68105467
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-30 10:52:04 +01:00 |
|
|
Vincent Augagneur
|
0020412aea
|
//added Preactivation request on dashboard
|
2013-10-30 10:51:58 +01:00 |
|
|
Rémi Gaillard
|
190c14ed9d
|
// delete src mails -> go mailsrc branch
|
2013-10-30 10:25:51 +01:00 |
|
|
Jérôme Nadaud
|
653c38e01a
|
Merge pull request #911 from madef/development
[-] BO : tagify call twice if field is not translatable
|
2013-10-30 00:55:53 -07:00 |
|
|
Madef
|
78af47e2d3
|
[-] BO : tagify call twice if field is not translatable
|
2013-10-29 23:18:34 +01:00 |
|
|
gRoussac
|
26b4fbf883
|
[*] BO : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/891 1/2
|
2013-10-29 19:07:31 +01:00 |
|
|
gRoussac
|
c98b5e0c78
|
[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski
|
2013-10-29 19:05:21 +01:00 |
|
|
Kevin Granger
|
df80e6ec8b
|
// btn-group-action adjustments
|
2013-10-29 18:55:33 +01:00 |
|
|
Kevin Granger
|
0b564c0107
|
// oups
|
2013-10-29 18:15:17 +01:00 |
|
|
Kevin Granger
|
aee725839e
|
// fixs btn-group
|
2013-10-29 18:10:07 +01:00 |
|
|
Rémi Gaillard
|
6d5ca9969e
|
// js error
|
2013-10-29 17:56:29 +01:00 |
|
|
Kevin Granger
|
5fa36abcaf
|
// fixs UI
|
2013-10-29 17:32:57 +01:00 |
|
|
Damien Metzger
|
c7fe91a0a9
|
// Fixed traffic sources chart on dashboard
|
2013-10-29 16:38:40 +01:00 |
|
|
Gregory Roussac
|
90bef56c84
|
Merge pull request #907 from djfm/development
// Frenglish
|
2013-10-29 08:24:45 -07:00 |
|
|
Damien Metzger
|
34aaeee0b5
|
// Fixed product images on the dashboard
|
2013-10-29 16:17:40 +01:00 |
|
|
gRoussac
|
75cde08776
|
// update conf message in AdminImport
|
2013-10-29 16:16:55 +01:00 |
|
|
gRoussac
|
c6319a754e
|
[-] BO : Stats are empty when no conversion rate
|
2013-10-29 16:04:15 +01:00 |
|
|
djfm
|
9d18ef8186
|
// Frenglish
|
2013-10-29 14:44:51 +00:00 |
|
|
Gregory Roussac
|
f58526c701
|
Merge pull request #905 from PhpMadman/RMARef
[-] BO : Order-follow displayed order id instead of order reference
|
2013-10-29 07:44:26 -07:00 |
|
|
Damien Metzger
|
d5eedd5eaa
|
Merge pull request #906 from djfm/development
// Small fix
|
2013-10-29 07:42:07 -07:00 |
|
|
gRoussac
|
a43851469e
|
[-] CORE : Currency conversion rate can not be 0
|
2013-10-29 15:39:17 +01:00 |
|
|
djfm
|
0288696c90
|
// English
|
2013-10-29 14:37:55 +00:00 |
|
|
Rémi Gaillard
|
64706075d5
|
// Fix default language on BO forms
|
2013-10-29 15:32:31 +01:00 |
|
|
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 |
|