From b24ae0d61d970139ae369a95e867984a75c5ad5d Mon Sep 17 00:00:00 2001 From: "E. Kolpakov" Date: Mon, 15 Aug 2016 18:48:01 +0300 Subject: [PATCH 1/2] Version update: Drag and Drop v2 --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 3a57218c6f..1b16d61695 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -97,4 +97,4 @@ git+https://github.com/edx/edx-proctoring.git@0.12.21#egg=edx-proctoring==0.12.2 # Third Party XBlocks -e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga -e git+https://github.com/open-craft/xblock-poll@v1.1#egg=xblock-poll==1.1 -git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.0.7#egg=xblock-drag-and-drop-v2==2.0.7 +git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.0.8#egg=xblock-drag-and-drop-v2==2.0.8 From a276f1c67c274eed520ef431aa5744c7d4b78d7b Mon Sep 17 00:00:00 2001 From: Saleem Latif Date: Tue, 16 Aug 2016 12:33:48 +0500 Subject: [PATCH 2/2] Add auto-generated discussion css files tio gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1b55818343..4be2989f47 100644 --- a/.gitignore +++ b/.gitignore @@ -98,6 +98,7 @@ cms/static/sass/*.css cms/static/sass/*.css.map cms/static/themed_sass/ themes/**/css/*.css +themes/**/css/discussion/*.css ### Logging artifacts log/