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

e00b666d

Commit e00b666d authored 10 years ago by Calen Pennington

Downloads
- Plain Diff

Merge pull request #5590 from cpennington/xblocks-with-children

Enable pure XBlocks to use children in edx-platform

parents 011b4dc1 fee681be

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

common/djangoapps/xmodule_modifiers.py 7 additions, 3 deletions

common/djangoapps/xmodule_modifiers.py
common/lib/xmodule/xmodule/x_module.py 26 additions, 9 deletions

common/lib/xmodule/xmodule/x_module.py
common/static/coffee/src/xblock/core.coffee 1 addition, 0 deletions

common/static/coffee/src/xblock/core.coffee
common/templates/xblock_wrapper.html 1 addition, 1 deletion

common/templates/xblock_wrapper.html
common/test/acceptance/pages/xblock/acid.py 15 additions, 2 deletions

common/test/acceptance/pages/xblock/acid.py
common/test/acceptance/tests/lms/test_lms_acid_xblock.py 15 additions, 6 deletions

common/test/acceptance/tests/lms/test_lms_acid_xblock.py
common/test/acceptance/tests/studio/test_studio_acid_xblock.py 0 additions, 2 deletions

...n/test/acceptance/tests/studio/test_studio_acid_xblock.py
requirements/edx/github.txt 2 additions, 2 deletions

requirements/edx/github.txt

with 67 additions and 25 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