Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

[MCKIN-7023] Improve XBlock i18n by allowing template translations #1032

Merged
merged 1 commit into from
Apr 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions requirements/edx/custom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

# When updating a hash of an XBlock that uses xblock-utils, please update its version hash in github.txt.
-e git+https://github.com/edx-solutions/xblock-mentoring.git@8837eb5d91fed05ec4758dfd9b9e7adc5c906210#egg=xblock-mentoring
-e git+https://github.com/edx-solutions/xblock-image-explorer.git@v0.6.0#egg=xblock-image-explorer==0.6.0
# FIXME -- use tag v1.1.0 when https://github.com/edx-solutions/xblock-image-explorer/pull/37 merged and tagged
-e git+https://github.com/edx-solutions/xblock-image-explorer.git@06b5aeb7d998b1193257e581b2648d9a82b881ed#egg=xblock-image-explorer==0.7.0
-e git+https://github.com/edx-solutions/xblock-drag-and-drop.git@92ee2055a16899090a073e1df81e35d5293ad767#egg=xblock-drag-and-drop
-e git+https://github.com/edx-solutions/xblock-drag-and-drop-v2.git@7b054467159fd2cbe2e0adccf9a0665d36a2a197#egg=xblock-drag-and-drop-v2
# Temporary new version for A2E course only; installs in parallel with the above version. Aim to remove this and upgrade the above ASAP.
-e git+https://github.com/open-craft/xblock-drag-and-drop-v2.git@1167385e492c7a79407db991c68dc3838e62c8ca#egg=xblock-drag-and-drop-v2-new
-e git+https://github.com/open-craft/xblock-drag-and-drop-v2.git@c98fd76eabbf9e2be85dad519acf1f8918960d03#egg=xblock-drag-and-drop-v2-new
-e git+https://github.com/edx-solutions/xblock-ooyala.git@v2.0.15#egg=xblock-ooyala==2.0.15
-e git+https://github.com/edx-solutions/xblock-group-project.git@6a68ea09478e49e796ee4c0a985018ec4257b7d7#egg=xblock-group-project
-e git+https://github.com/edx-solutions/xblock-adventure.git@7bdeb62b1055377dc04a7b503f7eea8264f5847b#egg=xblock-adventure
Expand Down
5 changes: 3 additions & 2 deletions requirements/edx/github.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,13 @@ git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd3
-e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock
-e git+https://github.com/edx/DoneXBlock.git@01a14f3bd80ae47dd08cdbbe2f88f3eb88d00fba#egg=done-xblock
git+https://github.com/edx/edx-milestones.git@v0.1.10#egg=edx-milestones==0.1.10
git+https://github.com/edx/xblock-utils.git@v1.0.5#egg=xblock-utils==1.0.5
# FIXME -- use tag v1.1.0 when https://github.com/edx/xblock-utils/pull/48 merged and tagged
git+https://github.com/edx-solutions/xblock-utils.git@ba54084a572a618b9248236403c1200f32d4f889#egg=xblock-utils==1.1.0
-e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
git+https://github.com/edx/edx-user-state-client.git@1.0.1#egg=edx-user-state-client==1.0.1
git+https://github.com/edx/xblock-lti-consumer.git@v1.1.5#egg=lti_consumer-xblock==1.1.5
git+https://github.com/edx/edx-proctoring.git@0.18.1#egg=edx-proctoring==0.18.1

# Third Party XBlocks
git+https://github.com/open-craft/xblock-poll@v1.2.7#egg=xblock-poll==1.2.7
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.0.18#egg=xblock-drag-and-drop-v2==2.0.18
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.0.18#egg=xblock-drag-and-drop-v2==2.0.18