Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

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

Snippets Groups Projects

89ac19e8

Commit 89ac19e8 authored 11 years ago by Christina Roberts

Downloads
- Plain Diff

Merge pull request #2503 from edx/christina/conditional

Conditional module changes to support Locator/Location conversion.

parents 0818b47f 276c6e91

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

common/lib/xmodule/xmodule/conditional_module.py 48 additions, 29 deletions

common/lib/xmodule/xmodule/conditional_module.py
common/lib/xmodule/xmodule/tests/test_export.py 1 addition, 0 deletions

common/lib/xmodule/xmodule/tests/test_export.py
common/test/data/conditional/conditional/condone.xml 4 additions, 3 deletions

common/test/data/conditional/conditional/condone.xml
common/test/data/conditional/course.xml 15 additions, 7 deletions

common/test/data/conditional/course.xml
common/test/data/conditional/html/congrats.xml 3 additions, 0 deletions

common/test/data/conditional/html/congrats.xml

with 71 additions and 39 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