Sarah Lorenzini
e6d0fe60c3
// new design for mailalerts mails template
2013-10-24 17:54:32 +02:00
Kevin Granger
a02c31f106
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/css/admin-theme.css
2013-10-24 17:53:30 +02:00
Damien Metzger
f6dd4a9ee4
// Code review
2013-10-24 17:49:18 +02:00
Kevin Granger
32d146d880
// admin orders
2013-10-24 17:36:50 +02:00
Sarah Lorenzini
1a7f9e6c11
// new design for blockwishlist mails template
2013-10-24 17:35:37 +02:00
Sarah Lorenzini
005a57b077
// new design for blocknewsletter mails template
2013-10-24 17:28:37 +02:00
Vincent Augagneur
6a552be7dd
//followup now use bootstrap design
2013-10-24 17:23:40 +02:00
PhpMadman
c516035e0e
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
2013-10-24 17:19:28 +02:00
Damien Metzger
b548f72ac5
// Attributes and values => Product Attributes
2013-10-24 17:18:45 +02:00
Jerome Nadaud
ea7b8b175e
// Fix list title
2013-10-24 17:18:14 +02:00
Damien Metzger
c39a74e479
// Renamed Feature into Product Features
2013-10-24 17:07:47 +02:00
Damien Metzger
df639337af
// Code cleaning and small fixes
2013-10-24 17:04:55 +02:00
Vincent Augagneur
f82322e426
//typo
2013-10-24 16:51:55 +02:00
Damien Metzger
d2ff076eb1
// Removed useless alert
2013-10-24 16:43:41 +02:00
Damien Metzger
2931c20914
// Fixed rounding
2013-10-24 16:38:48 +02:00
gRoussac
c5324a653b
[-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x
2013-10-24 16:31:50 +02:00
Rémi Gaillard
3cd702da42
[-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793
2013-10-24 16:30:02 +02:00
djfm
c8e75eec03
// fixed indentation in e-mail html templates
2013-10-24 14:25:17 +00:00
Gregory Roussac
65401efcb6
Merge pull request #887 from indesign47/patch-13
...
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 07:22:57 -07:00
Sarah Lorenzini
a44cdf785e
// new design for followup module mail
2013-10-24 16:18:52 +02:00
indesign47
84454bbc1c
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 16:16:29 +02:00
djfm
0603c54756
[*] LO : New English E-Mail templates by SuperSarah
2013-10-24 14:15:19 +00:00
Gregory Roussac
3f11dde2f6
Merge pull request #886 from djfm/bootstrap
...
//emails
2013-10-24 07:09:10 -07:00
djfm
572f7c725d
// small html fix
2013-10-24 14:04:50 +00:00
djfm
3e8330dcb3
// small fixes on php email templates
2013-10-24 13:58:14 +00:00
indesign47
f0ed5a303c
[*] BO : AdminImport add img suppliers
2013-10-24 15:49:56 +02:00
indesign47
4803530eed
[*] BO : AdminImport add img manufacturers
2013-10-24 15:47:31 +02:00
indesign47
ea8a5277f2
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 15:44:11 +02:00
Rémi Gaillard
667647f891
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-24 15:23:25 +02:00
Rémi Gaillard
691e45a168
// delete useless file
2013-10-24 15:23:03 +02:00
Damien Metzger
6a2e847970
// dashboard improvements
2013-10-24 15:04:06 +02:00
Damien Metzger
a9f75a02a7
// Added missing icons for modules
2013-10-24 14:15:44 +02:00
Damien Metzger
a1df97776a
// Set default values
2013-10-24 13:54:55 +02:00
gRoussac
2ffc296279
FO : https://github.com/PrestaShop/PrestaShop/pull/878
2013-10-24 12:03:33 +02:00
Rémi Gaillard
971722a13f
// note updated by ajax in admincustomers should be url encoded
2013-10-24 11:56:50 +02:00
Rémi Gaillard
4bfd8dee11
// note updated by ajax in admincustomers should be url encoded
2013-10-24 11:51:48 +02:00
Damien Metzger
dd6aa1a077
Merge pull request #881 from emilien-puget/bootstrap
...
// changed path from dirname(__FILE__) to PS_ROOT_DIR
2013-10-24 02:49:34 -07:00
gRoussac
fc9b39968b
// remove notice
2013-10-24 11:46:09 +02:00
emilien-puget
92c2f6953f
changed path from dirname(__FILE__) to PS_ROOT_DIR
2013-10-24 11:44:52 +02:00
Damien Metzger
a34784a15d
// Fixed chart for period before the store creation
2013-10-24 11:17:33 +02:00
Damien Metzger
d173b2d4cd
Merge pull request #880 from djfm/bootstrap
...
// use automatic path for css in mail template header
2013-10-24 01:45:41 -07:00
djfm
baed28f1a7
// use automatic path for css in mail template header
2013-10-24 08:37:08 +00:00
Rémi Gaillard
9a7c3dd88f
// small fix
2013-10-24 10:14:44 +02:00
gRoussac
81945cef71
[-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879
2013-10-24 10:00:19 +02:00
Gregory Roussac
1cc0134ec3
Merge pull request #879 from neemzy/development
...
[-] FO : OPC hide VAT fields fail if there are no company fields
2013-10-24 00:55:55 -07:00
Fabio Chelly
b9de912dd3
[-] MO : Fixed bug PNM-1431 - referralprogram Lack the % sign
2013-10-24 09:53:16 +02:00
Damien Metzger
e17dd1fdde
// theme installation
2013-10-24 09:49:46 +02:00
Tom Panier
6d3640e895
Conditions to hide VAT fields fail if there are no company fields
...
"Company" fields may or may not be rendered on this form, whereas "VAT" fields are always rendered and depend on the former ones to be shown (or hidden) with CSS.
This fixes an edge case where there are no "Company" fields rendered and "VAT" fields still wrongly appear, which was caused by the fact that `$('#field').val() != ''` is truthy when `$('#field').length` is zero (since `'' != undefined`).
2013-10-24 09:43:50 +02:00
Sarah Lorenzini
d9382a0a5b
// update mail template
2013-10-24 09:28:04 +02:00
Damien Metzger
9e0125d0b6
// theme installation
2013-10-23 19:09:14 +02:00
Sarah Lorenzini