Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MJML 3 #321

Merged
merged 98 commits into from
Oct 18, 2016
Merged
Changes from 1 commit
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
d9c806d
Start work on xsd for xml validation
loeck May 9, 2016
493dc16
Add helper for detect node<>browser
loeck May 11, 2016
6558eaa
Test xsd
loeck May 11, 2016
892fa40
Add xsd for mj-container
loeck May 11, 2016
ccf88ca
Merge branch 'master' into xsd
loeck May 11, 2016
ee84cbb
Add default attributes on all packages
loeck May 12, 2016
320f480
Merge master into xsd
iRyusa Jun 30, 2016
d5d76d8
mj-style
iRyusa Jul 4, 2016
0d7fa19
move import
iRyusa Jul 4, 2016
ec1c969
Unused + revert test.js
iRyusa Jul 4, 2016
5e24f92
packagejson
iRyusa Jul 4, 2016
b4ccdfa
basic XSD output
iRyusa Jul 8, 2016
e7dba7b
XSD is alive
iRyusa Jul 8, 2016
8ab871c
Merge branch 'master' into xsd
iRyusa Jul 8, 2016
02200d8
merge errors
iRyusa Jul 8, 2016
955c580
revert some merge issue
iRyusa Jul 11, 2016
e64455b
Support mj head + move on document parser
iRyusa Jul 11, 2016
b0d52af
XSD errors are finally parsed...
iRyusa Jul 21, 2016
2fba7d6
client now display errors properly
iRyusa Jul 25, 2016
0f53b49
Fix default xsd mj-body + #317
iRyusa Jul 28, 2016
9291cac
validation document attribute
iRyusa Jul 28, 2016
ec405af
should fix tests
iRyusa Jul 28, 2016
527fb12
should fix travis error
iRyusa Jul 28, 2016
6e5f691
addons ?
iRyusa Jul 28, 2016
9717570
skipping validation
iRyusa Jul 28, 2016
0a389ee
Adding inner padding to social #327
iRyusa Aug 9, 2016
17a787d
Fix #341 ... not the best workaround
iRyusa Aug 10, 2016
d4029ab
Add border to column/section, validation level is now on cli
iRyusa Aug 12, 2016
f1fb290
Should fix CI issues + remove legacy validate xsd
iRyusa Aug 12, 2016
33d95ab
typo for test
iRyusa Aug 12, 2016
e57b461
Merge branch 'master' into xsd
iRyusa Aug 16, 2016
2ae2199
Merge branch 'master' into xsd
iRyusa Aug 16, 2016
e3afe1c
Merge Mj Style into MJML Validation
iRyusa Aug 16, 2016
ce28f41
use ~ instead of ^ for mjml inter dependencies
iRyusa Aug 16, 2016
08c4311
ignore some useless codes
iRyusa Aug 16, 2016
63ae66d
err..or
iRyusa Aug 17, 2016
382aa53
Allow to modify default font #354
iRyusa Aug 17, 2016
d52768e
Should fix #336
iRyusa Aug 17, 2016
6aaac08
fix react warning on mj location
iRyusa Aug 22, 2016
1886cb5
Mj include is now recursive
iRyusa Aug 24, 2016
45103de
Merge branch 'master' into xsd
iRyusa Aug 24, 2016
027f739
border bottom top left right + radius for column & section #363
iRyusa Aug 24, 2016
ed74927
Missing border in documentation
iRyusa Aug 24, 2016
10fdadc
button width/height
iRyusa Aug 25, 2016
2073ef0
Start refactoring config parser from renderer
iRyusa Aug 25, 2016
7e3ebe9
config parser fix
iRyusa Aug 25, 2016
a114a30
Multiple fix for release
iRyusa Sep 16, 2016
dd7ff78
New json validator instead of XSD
iRyusa Sep 21, 2016
ebf2308
Merge branch 'master' into xsd
iRyusa Sep 21, 2016
cce1c79
bring error level back
iRyusa Sep 22, 2016
19e2079
Move mjml-validator in it's own package
iRyusa Sep 22, 2016
0b9cc7f
Will fix button with merge of #387
iRyusa Sep 22, 2016
b13be77
Doc + minor fix
iRyusa Sep 26, 2016
758c6f3
Cleaner renderer + fix CI ?
iRyusa Sep 26, 2016
34559ca
link missing ?
iRyusa Sep 26, 2016
b8e5b58
build
iRyusa Sep 26, 2016
3cd8401
build again
iRyusa Sep 26, 2016
3544401
Try to fix build... + test fix
iRyusa Sep 26, 2016
54a4c6d
list
iRyusa Sep 26, 2016
d4d81d1
test travis build
iRyusa Sep 27, 2016
252d156
travis build ..
iRyusa Sep 27, 2016
6346e8a
gulp build
iRyusa Sep 27, 2016
435c774
Link
iRyusa Sep 27, 2016
fb2b772
link core again
iRyusa Sep 27, 2016
92c3f49
deprecated stuff
iRyusa Sep 27, 2016
a8dcef2
install before link ?
iRyusa Sep 27, 2016
94fd24a
Update dependencies, prepare mjml v3.0.0-beta.1
Sep 28, 2016
6fb7af7
Merge branch 'master' into xsd
iRyusa Sep 28, 2016
91aa0bf
Merge remote-tracking branch 'origin/xsd' into xsd
iRyusa Sep 28, 2016
1359118
Fix parentTag on mj-group
iRyusa Sep 28, 2016
c274e6c
Add whitelist global tag
iRyusa Sep 28, 2016
69431bb
newline fix + root tag undefined
iRyusa Sep 29, 2016
a875a9d
Missing attributes on mj-text
iRyusa Sep 29, 2016
5d0e811
Should fix most of issues in beta 0
iRyusa Sep 29, 2016
cc87226
Fix mono children node + location missing attr
iRyusa Sep 29, 2016
434e3b3
Plural/Singular on Attributes
ngarnier Sep 29, 2016
4e90db6
fix non react children..
iRyusa Sep 29, 2016
ff2c39a
Add ChildComponent.tagName in the error
ngarnier Sep 29, 2016
208028b
Update README.md
ngarnier Sep 29, 2016
b89a685
Fix when no \n
iRyusa Oct 3, 2016
eb56e8c
Prepare beta.2
Oct 4, 2016
b09f1cf
fix background on mj-group
iRyusa Oct 5, 2016
22eb4c9
mj group fix for outlook 2003 & 2000 thanks to @dalefish
iRyusa Oct 5, 2016
aeeac79
default value for padding section/button like mjml2 (oops)
iRyusa Oct 5, 2016
a192309
Missing attrs, reverse column order in mobile/desktop 😱
iRyusa Oct 6, 2016
7e5cc0f
vertical align removed by mistake + safe width
iRyusa Oct 6, 2016
9d2d2c6
should fix invoice
iRyusa Oct 6, 2016
ea4d53d
missing attributes
iRyusa Oct 6, 2016
f3828a5
Documenting direction
ngarnier Oct 6, 2016
5a0ae7a
export validator
iRyusa Oct 7, 2016
1ea40af
Update doc + link
ngarnier Oct 7, 2016
23a7c3e
Prepare 3.0.0-beta.3
Oct 7, 2016
2d354e2
Update create.md
ngarnier Oct 12, 2016
8ae319a
disable packages for browser ( lazy require ), add missing trad + val…
iRyusa Oct 14, 2016
a84a72c
better catch
iRyusa Oct 17, 2016
1244afe
Merge branch 'master' into xsd
iRyusa Oct 17, 2016
1eacd12
Merge branch 'master' into xsd
iRyusa Oct 17, 2016
7a64863
Update validChildren.js
ngarnier Oct 17, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/mjml-core/src/parsers/document.js
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ const safeEndingTags = content => {
return content
}

bodyContent = bodyContent[0]
bodyContent = bodyContent[0].replace('$', '&#36;') // $ is a protected chars for regexp... avoid issue with duplicate content

endingTags.forEach(tag => {
bodyContent = bodyContent.replace(regexTag(tag), dom.replaceContentByCdata(tag))