Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,831 Commits 1 Branch 0 Tags
f14dd9d3c577ce13ee970612e3d9c2b5db6dee79
Commit Graph

203 Commits

Author SHA1 Message Date
Ned Batchelder
10bd2b003f Merge pull request #5129 from edx/ned/python-zip-assets 
Python zip file importable from an asset
 2014-09-18 19:31:47 -04:00
Ned Batchelder
616bbbab4e Importable python_lib.zip assets 
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
 2014-09-18 17:59:12 -04:00
David Baumgold
6325206d49 Merge pull request #4697 from edx/db/update-multiple-deps 
Upgrade scipy, lxml, boto, edx-ora2
 2014-09-18 15:16:04 -04:00
David Baumgold
649288fc68 Update ora2 and submissions 2014-09-18 14:04:31 -04:00
John Eskew
9e830d08c4 Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy. 2014-09-18 12:27:32 -04:00
Chris Rossi
1e2ce7bd94 Upgrade edx-jsme to the latest version. 
This fixes a minor layout bug in edx-jsme 1.0. See:
https://github.com/jazkarta/edx-jsme/issues/1

For convenience, the entire diff from the last release is included here:

diff --git a/CHANGES.rst b/CHANGES.rst
new file mode 100644
index 0000000..32e0284
--- /dev/null
+++ b/CHANGES.rst
@@ -0,0 +1,13 @@
+===================
+edX-JSME Change Log
+===================
+
+1.0.1 (2014-09-17)
+------------------
+
+- Fix alignment issue with the correct/incorrect markers. (#1)
+
+1.0 (2014-07-28)
+----------------
+
+- Initial release.
diff --git a/edx_jsme/templates/jsmeinput.html b/edx_jsme/templates/jsmeinput.html
index 861b43f..5ceaf3d 100644
--- a/edx_jsme/templates/jsmeinput.html
+++ b/edx_jsme/templates/jsmeinput.html
@@ -38,6 +38,7 @@
     waitfor=""
     value="${value|h}"/>

+    <br/>
     <p id="answer_${id}" class="answer"></p>

     <p class="status">
 2014-09-17 16:48:23 -04:00
Carlos Andrés Rocha
8857509b2d Add edX OAuth2 provider with OpenID Connect support 2014-09-17 11:36:06 -04:00
clytwynec
3f5b829d0e Merge pull request #5147 from edx/clytwynec/auto_capture_har_on_error 
enable auto-capturing of hars in bok-choy tests
 2014-09-17 09:15:20 -04:00
Don Mitchell
6a26e9c186 Update github for asset char 
LMS-11380
 2014-09-16 09:05:38 -04:00
Sarina Canelake
49d069dd9e RTL i18n tooling 2014-09-15 13:46:06 -04:00
Christine Lytwynec
1be81109e5 enable auto-capturing of hars in bok-choy tests 2014-09-15 12:14:47 -04:00
Renzo Lucioni
9239253614 Remove Django Waffle 2014-09-12 16:22:03 -04:00
Andy Armstrong
04595a7b3d Update platform to use the latest ORA release 2014-09-12 10:32:29 -04:00
Piotr Mitros
520fc2b09d New XBlock with final/tested/non-prototype scope_key 2014-08-29 16:00:10 -04:00
Stephen Sanchez
cd683cecd2 Updated ORA2 tag for release for August 29th, 2014 2014-08-29 18:14:39 +00:00
clytwynec
118baafb1f Merge pull request #4943 from edx/mvo/bumping_bok_choy_version 
bumping bok choy version
 2014-08-29 10:08:51 -04:00
Minh Tue Vo
688909eb76 bumping bok choy version 
check firefox version, raise exception with instructions for updating
 2014-08-28 16:58:55 -04:00
Nimisha Asthagiri
e42a3f15db Update opaque-keys library to use block_id for html_id for new keys. 
Catch more places where get_children was giving us version aware references.
LMS-11237
 2014-08-25 17:41:57 -04:00
Piotr Mitros
d0ac4c375e Update to latest XBlock 2014-08-25 10:24:55 -04:00
Ben McMorran
30fc0441d1 Merge pull request #4782 from edx/reruns/ui 
Reruns/ui
 2014-08-21 16:57:00 -04:00
Jesse Zoldak
337a75598f Update bok-choy version 2014-08-21 12:16:42 -04:00
Don Mitchell
0d1669c612 DateTime fields can support datetime values. 
LMS-11209
 2014-08-21 12:11:26 -04:00
Justin Helbert
dd7f09d36a This confirms the data api upgrade 2014-08-19 19:03:58 +00:00
David Baumgold
79f3526c6f Update i18n-tools 2014-08-14 17:05:10 -04:00
Matjaz Gregoric
16a2940977 Update django-splash. 
The new release supports wildcards in path exclusion rules.
 2014-08-14 19:03:41 +02:00
Sarina Canelake
6dd9d9ec3f Merge pull request #4586 from jazkarta/edx-jsme-1.0 
Release edx-jsme 1.0
 2014-08-14 10:02:55 -04:00
Chris Rossi
88af00904f Release edx-jsme 1.0 2014-08-11 09:04:27 -04:00
Filippo Valsorda
6378c01a47 enforce-type: set the edx/XBlock#200 merge hash 2014-08-08 09:14:10 -07:00
Filippo Valsorda
a9930bf34a Make enforce_type an optional flag, to avoid conflicts 2014-08-08 09:14:10 -07:00
Filippo Valsorda
0482038756 Enforce type of the XBlocks Fields when set 
This updates the XBlock dependency to edX/XBlock@***
and add the newly introduced enforce_type methods
 2014-08-08 09:14:10 -07:00
Will Daly
949c965648 ORA2 release-2014-08-08T13.47 2014-08-08 09:48:26 -04:00
Will Daly
228aa77150 ORA2 release-2014-08-07T20.03 2014-08-07 19:56:57 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Daniel Friedman
4b6035bafb Automatically collect HAR data for performance testing 2014-08-07 12:27:38 -04:00
Will Daly
41ba395900 ORA2 hotfix 2014-08-06 2014-08-06 13:59:31 -04:00
Muhammad Ammar
c237364e2d Refactor LMS Video Tests 2014-08-06 13:20:39 +00:00
Stephen Sanchez
062e723e8a Updating ORA2 hash for hotfix August 5th, 2014 2014-08-05 17:41:09 -04:00
David Baumgold
c4505e7350 Downgrade scipy, lxml, boto, edx-ora2 2014-07-31 12:06:13 -04:00
David Baumgold
adee992106 new release of edx-ora2 2014-07-31 10:06:43 -04:00
Will Daly
5dc884bdb9 ORA2 release-2014-07-28T12.09 2014-07-28 11:56:35 -04:00
Calen Pennington
f6b278e7f8 Merge pull request #4537 from cpennington/new-locator-key-prefixes 
Use a version of opaque keys that identifies version numbers in the key prefixes
 2014-07-24 15:55:33 -04:00
Calen Pennington
3f47fe4a61 Use a version of opaque keys that identifies version numbers in the key prefixes 2014-07-24 09:32:06 -04:00
Jay Zoldak
c21dbe4cd2 Improvements to clicking and synchronization in Studio bok-choy tests. 2014-07-24 08:55:34 -04:00
Stephen Sanchez
77d3c3fdb8 Updating the ORA2 hash for July 21st, 2014 2014-07-21 08:24:33 -04:00
Sarina Canelake
88a3bac947 Update opaque-keys library 2014-07-14 13:04:13 -04:00
Stephen Sanchez
a41d04e65b Updating release tag for July 14th, 2014 2014-07-14 10:23:14 -04:00
Diana Huang
ad7e0f94fb Update opaque-keys hash 2014-07-11 15:40:09 -04:00
Mat Peterson
aee47b44df Testing for bugs off master for opaque-keys deprecation 2014-07-11 15:40:08 -04:00
Will Daly
e582337522 ORA2 release-2014-07-07T19.28 2014-07-08 13:50:28 -04:00
Will Daly
28cb25a1e4 Revert "ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4" 
This reverts commit f40834fa2f.
 2014-07-02 14:21:29 -04:00