Skip to content

Commit

Permalink
Merge pull request #4366 from mirumee/feature/rich-text-content-stror…
Browse files Browse the repository at this point in the history
…efront1

Render rich-text content from Draftail in Storefront 1.0
  • Loading branch information
maarcingebala committed Jul 19, 2019
2 parents 89fb7d8 + 9e9c979 commit 0fee094
Show file tree
Hide file tree
Showing 36 changed files with 580 additions and 121 deletions.
2 changes: 1 addition & 1 deletion .isort.cfg

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ razorpay = ">=1.1.1"
stripe = "*"
"urllib3" = "*"
dataclasses = {version = "*",markers = "python_version < '3.7'"}
html-to-draftjs = "*"
draftjs-sanitizer = "*"

[dev-packages]
pytest = "*"
Expand Down
128 changes: 90 additions & 38 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 18 additions & 13 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ amqp==2.5.0
aniso8601==6.0.0
autopep8==1.4.4
babel==2.7.0
beautifulsoup4==4.7.1
billiard==3.6.0.0
bleach==2.1.4
boto3==1.9.180
botocore==1.12.180
boto3==1.9.189
botocore==1.12.189
braintree==3.49.0
cachetools==3.1.1
cairocffi==1.0.2
Expand All @@ -26,7 +27,7 @@ django-bootstrap4==0.0.8
django-cache-url==3.0.0
django-countries==5.3.3
django-elasticsearch-dsl==0.5.1
django-filter==2.1.0
django-filter==2.2.0
django-graphql-jwt==0.2.1
django-impersonate==1.4.1
django-js-asset==1.2.2
Expand All @@ -46,9 +47,10 @@ django-versatileimagefield==1.10
django-webpack-loader==0.6.0
django==2.2.3
docutils==0.14
draftjs-sanitizer==1.0.0
elasticsearch-dsl==6.0.1
elasticsearch==6.3.1
faker==1.0.7
faker==2.0.0
freezegun==0.3.12
google-api-core==1.13.0
google-auth==1.6.3
Expand All @@ -60,29 +62,31 @@ google-resumable-media==0.3.2
googleapis-common-protos==1.6.0
gprof2dot==2016.10.13
graphene-django-optimizer==0.4.2
graphene-django==2.3.2
graphene==2.1.6
graphene-django==2.4.0
graphene==2.1.7
graphql-core==2.2
graphql-relay==0.4.5
graphql-relay==2.0.0
html-to-draftjs==1.0.0
html5lib==1.0.1
idna==2.8
ipaddress==1.0.22
jinja2==2.10.1
jmespath==0.9.4
jsonfield==2.0.2
kombu==4.6.3
lxml==4.3.4
markdown==3.1.1
markupsafe==1.1.1
maxminddb-geolite2==2018.703
maxminddb==1.4.1
measurement==2.0.1
mpmath==1.1.0
oauthlib==3.0.1
phonenumberslite==8.10.14
oauthlib==3.0.2
phonenumberslite==8.10.15
pillow==5.4.1
prices==1.0.0
promise==2.2.1
protobuf==3.8.0
protobuf==3.9.0
psycopg2-binary==2.8.3
purl==1.5
pyasn1-modules==0.2.5
Expand All @@ -101,20 +105,21 @@ redis==3.2.1
requests-oauthlib==1.2.0
requests==2.22.0
rsa==4.0
rx==1.6.1
rx==3.0.0
s3transfer==0.2.1
singledispatch==3.4.0.3
six==1.12.0
social-auth-app-django==3.1.0
social-auth-core==3.2.0
soupsieve==1.9.2
sqlparse==0.3.0
stripe==2.32.0
stripe==2.32.1
sympy==1.4
text-unidecode==1.2
tinycss2==1.0.2
typing==3.7.4
urllib3==1.25.3
uwsgi==2.0.18 ; platform_system != 'Windows'
vine==1.3.0
weasyprint==47
weasyprint==48
webencodings==0.5.1

0 comments on commit 0fee094

Please sign in to comment.