Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3583 Commits

Author SHA1 Message Date
Sarina Canelake
02bfe039fd Merge pull request #5431 from open-craft/datadog-wrapper 
Consistently wrap the DataDog API to prevent logged errors & missing stats data
 2014-10-10 14:59:38 -04:00
Braden MacDonald
a8f622af7f Consistently ensure dog_stats_api tags are formatted correctly 2014-10-09 12:35:26 -07:00
Don Mitchell
b7b5400c3e Upgrade pymongo 
LMS-11437
 2014-10-09 11:55:14 -04:00
Calen Pennington
87558c2c9c Merge pull request #5212 from cpennington/split/import-export-performance 
Improve performance of split-mongo import/export performance
 2014-09-30 15:44:04 -04:00
Calen Pennington
ef23c19bf4 Prevent queries into split using deprecated CourseLocators, BlockUsageLocators, or DefinitionLocators 2014-09-29 22:35:41 -04:00
Calen Pennington
eea1552e0b Upgrade to a more performant version of opaque-keys 2014-09-29 22:35:40 -04:00
David Baumgold
223efa168b Update djpyfs 
And move from base.txt to github.txt
 2014-09-29 12:23:30 -04:00
Calen Pennington
46c6a5de8a Bump version of PyContracts so that it will disable the 'check' function 2014-09-29 10:32:15 -04:00
Ned Batchelder
4d56f62d99 Merge pull request #5199 from edx/ned/remove-jsdraw 
Remove JSDraw
 2014-09-25 23:03:50 -04:00
Carlos Andrés Rocha
8d04580a0c Update version of edx-oauth2-provider 2014-09-24 11:35:33 -04:00
Ned Batchelder
364989b9ee Remove JSDraw 2014-09-24 09:56:05 -04:00
Andy Armstrong
fe6668a550 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
 2014-09-23 15:53:10 -04:00
David Ormsbee
4f5d8b30de Basic Mobile API (v0.5) and Video Abstraction Layer integration. 
Note that the features in this release are opt-in, and course and video
behavior will remain the same unless a course explicitly opts in.

Major pieces of functionality with this commit:

Allows the listing of a user's enrollments, course videos, and updates. In
order to make a course available for mobile use, course staff must explicitly
set the Course Advanced Setting "Mobile Course Available" to true. Course staff
will always see their own courses through the Mobile API regardless of this
setting, but students will only be allowed to see a course through the Mobile
API if this setting is set to "true". By default, a Course will *not* be
available for mobile use.

This is a Django app for video resource management. It is completely optional,
and is intended to allow video and operations teams to create new encodings of
videos (e.g. low res for mobile) and change CDNs without having to edit course
data directly. Course teams can now use a "EdX Video ID" setting for Videos,
which will leverage VAL. Video units that do not fill in an "EdX Video ID" will
behave exactly as they always have.

* The Mobile API is enabled with the ENABLE_MOBILE_REST_API feature flag.
* VAL is enabled with the ENABLE_VIDEO_ABSTRACTION_LAYER_API feature flag.
* VAL and the Mobile API both require ENABLE_OAUTH2_PROVIDER).
* The Mobile API is a read-only API, but VAL requires database migrations.
* Applications that make use of either the Mobile API or VAL must be registered
  with the OAuth2 provider app in Django Admin.
 2014-09-23 12:31:46 -04:00
swdanielli
165b015fe0 move to s3fs and handle one time url 2014-09-19 09:39:17 -04:00
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
David Baumgold
883c9cee84 Upgrade scipy, lxml, boto 2014-09-17 10:48:33 -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
Piotr Mitros
98ef21a9cb Pyfilesystem fix for AWS 2014-09-16 09:45:42 -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
Don Mitchell
218611c878 Merge pull request #5196 from edx/release 
hotfix-2014-09-12
 2014-09-12 12:32:40 -04:00
Andy Armstrong
04595a7b3d Update platform to use the latest ORA release 2014-09-12 10:32:29 -04:00
Adam
d9567c3537 Merge pull request #5178 from edx/release 
Release
 2014-09-11 15:15:13 -04:00
Usman Khalid
fc895fe8bf Moved imports to startup.py. 2014-09-11 20:14:37 +05:00
Calen Pennington
b033a214cf Merge pull request #5131 from cpennington/split/prod-import-export-tests 
Split-mongo block uniqueness constraint [LMS-11364]
 2014-09-11 10:43:43 -04:00
Don Mitchell
4ebe26696e Merge branch 'release' 
Conflicts:
	common/djangoapps/student/views.py
 2014-09-11 10:31:53 -04:00
Calen Pennington
7b81dcc3ea Make split_mongo assert block identity uniqueness only over (block_type, block_id) tuples [LMS-11364] 2014-09-11 09:38:13 -04:00
Feanil Patel
8f1a285c33 Downgrade gunicorn. 2014-09-10 14:44:49 -04:00
Sarina Canelake
4596e8c212 Merge pull request #5151 from open-craft/mentoring-enforce 
mentoring: Allow partial answers when dependency isn't enforced
 2014-09-10 14:22:11 -04:00
Tim Babych
c34fb143ba Merge pull request #5093 from edx/tim/update-django-1.4.14 
Update Django version to release 1.4.14
 2014-09-10 20:09:28 +03:00
Xavier Antoviaque
15319925ed mentoring: Allow partial answers when dependency isn't enforced 2014-09-10 11:11:21 +02:00
Piotr Mitros
6d914e2b0a AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-09 08:43:18 -04:00
Piotr Mitros
31176aeb37 AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-08 10:46:18 -04:00
Piotr Mitros
5364508e48 Merge pull request #5108 from edx/pmitros/retrofix-xargs 
XBlock argument passing support backport from SDK
 2014-09-07 12:51:56 -04:00
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -04:00
Carson Gee
d640b53760 Merge pull request #5000 from mitocw/cg/upgrade_gunicorn 
Upgrading gunicorn to latest
 2014-09-05 15:58:02 -04:00
Tim Babych
496d714879 Update Django version to release 1.4.14 2014-09-05 14:49:59 +03: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
Carson Gee
a0ccb942ee Upgrading gunicorn to latest 2014-08-27 16:38:01 -04:00