Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization (2699ba65) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

2699ba65

Commit 2699ba65 authored 11 years ago by chrisndodge

Downloads
- Plain Diff

Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization

Fix/cdodge/incorrect html serialization

parents a7851a98 938b0946

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

cms/djangoapps/contentstore/tests/test_contentstore.py 32 additions, 0 deletions

cms/djangoapps/contentstore/tests/test_contentstore.py
common/lib/xmodule/xmodule/html_module.py 22 additions, 16 deletions

common/lib/xmodule/xmodule/html_module.py
common/lib/xmodule/xmodule/tests/test_export.py 0 additions, 6 deletions

common/lib/xmodule/xmodule/tests/test_export.py
common/test/data/toy/course/2012_Fall.xml 2 additions, 0 deletions

common/test/data/toy/course/2012_Fall.xml
common/test/data/toy/html/just_img.html 1 addition, 0 deletions

common/test/data/toy/html/just_img.html
common/test/data/toy/html/just_img.xml 1 addition, 0 deletions

common/test/data/toy/html/just_img.xml
common/test/data/toy/html/with_styling.html 1 addition, 0 deletions

common/test/data/toy/html/with_styling.html
common/test/data/toy/html/with_styling.xml 1 addition, 0 deletions

common/test/data/toy/html/with_styling.xml

with 60 additions and 22 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment