Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,583 Commits 1 Branch 0 Tags
08e90d2e993a96fd191af940bb9b4531a76cbf59
Commit Graph

507 Commits

Author SHA1 Message Date
swdanielli
b009ac8f41 testcases for RecommenderXBlock 
This involves moving from edx-private to github
 2014-12-29 18:21:35 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release 
Release
 2014-12-19 13:23:22 -05:00
christopher lee
7bf8221b89 updated commit hash for VAL 2014-12-18 17:04:19 -05:00
Jesse Zoldak
94f3596d21 Merge pull request #6288 from edx/zoldak/update-django-nose 
Update django-nose version
 2014-12-17 15:40:31 -05:00
Adam Palay
4d2df01d7d update ora version 2014-12-17 13:47:39 -05:00
Jesse Zoldak
2df2f60a32 Update django-nose version 2014-12-17 09:33:46 -05:00
Jesse Zoldak
eb465b3034 Update to the latest lettuce and install from pypi 2014-12-16 15:54:22 -05:00
Nimisha Asthagiri
0687a62a8f Add back end for Studio video upload feature 
This feature allows upload of video assets to S3. This requires that the
VIDEO_UPLOAD_PIPELINE setting be properly configured and that each
course be configured with a token issued by the media team for their
processing purposes (e.g. linking the video with a YouTube channel).

Co-authored-by: Greg Price <gprice@edx.org>
 2014-12-15 13:09:59 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
David Baumgold
d65d3094cf Update pep8 to 1.5.7 2014-12-11 11:36:18 -05:00
David Baumgold
4f823396ed Merge pull request #4276 from edx/db/update-pillow 
Update pillow to 2.6.1
 2014-12-11 10:34:19 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release' 
Release 2014-12-10
 2014-12-09 17:39:17 -05:00
Adam Palay
b85a4655c4 update codejail for better logging (TNL-835) 2014-12-08 16:01:02 -05:00
David Baumgold
ca42dda7a7 Merge pull request #6127 from mitocw/cg/pin_cas_client 
Pin django-cas to hash
 2014-12-08 13:32:55 -05:00
Carson Gee
189284ace6 Pin django-cas to hash 
Move to github.txt and make editable
 2014-12-05 09:25:12 -05:00
Braden MacDonald
0ded669909 Split mongo support for libraries and Library XBlock 2014-12-04 21:39:10 +07:00
Christine Lytwynec
d852bc9251 Revert "Do not install requirements from github.txt in editable mode" 
This reverts commit 61cf1d6edb.

Conflicts:
	requirements/edx/github.txt
 2014-12-02 15:52:53 -05:00
Clinton Blackburn
46d5593201 Merge pull request #6105 from edx/clintonb/oidc-administrator-claim 
Added OAuth2 Permissions Scope Handler
 2014-12-02 11:11:15 -05:00
Clinton Blackburn
5a561f81d4 Added OAuth2 Permissions Scope Handler 
This scope offers a simple claim, administrator, that is true iff the user is a superuser.
 2014-12-02 11:08:44 -05:00
Greg Price
30d4dc44b8 Add paver option to specify js-test-tool port 
This includes an upgrade to a newer version of js-test-tool that accepts
an option to specify the port number.
 2014-12-01 13:05:40 -05:00
Jesse Zoldak
eacd52568c Merge pull request #6038 from edx/zoldak/not-editable-mode 
Do not install requirements from github.txt in editable mode
 2014-12-01 09:43:24 -05:00
David Baumgold
f79383102a Update pillow to 2.6.1 2014-12-01 09:19:35 -05:00
stv
c7e7b5622a Update contact info for licensing questions 2014-11-26 15:16:04 -05:00
Jesse Zoldak
61cf1d6edb Do not install requirements from github.txt in editable mode 2014-11-24 12:09:04 -05:00
David Baumgold
3676b4f72f Upgrade diff-cover 2014-11-12 14:17:27 -05:00
Usman Khalid
96b1a17b66 Merge pull request #5816 from edx/usman/plat71-mongo-autoreconnect-errors-2 
Proxy to retry on mongo Autoreconnect errors.
 2014-11-10 19:56:11 +05:00
Carlos Andrés Rocha
1b858e5497 Merge pull request #5749 from rocha/cache-oauth2-handler-course-values 
Cache user course privileges during OpenID Connect authorization.
 2014-11-07 14:38:09 -05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page. 
TNL-683
 2014-11-06 15:48:55 -05:00
Carlos Andrés Rocha
fac73e88d0 Cache user course privileges during OpenID Connect authorization. 2014-11-06 13:46:32 -05:00
Usman Khalid
328a79cc60 Wrap pymongo connections in MongoProxy. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Greg Price
d2183c58c8 Add endpoint to log in with OAuth access token 2014-11-05 14:09:41 -05:00
John Eskew
3534ba70ca Changes for PR review: More compact tests, enumeration for metadata 
sort order, etc.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 18:49:38 -05:00
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00
Clinton Blackburn
a3171eb8d8 Removed Analytics API Client 
Instructors should use Insights instead.
 2014-10-29 10:25:18 -04:00
Adam Palay
4e628ad2e4 update ora2 to fix TNL-680 2014-10-27 15:37:24 -04:00
Ben Patterson
9642468c98 Optimize run_quality calls 
Leverages recent changes in diff-cover to reduce number of diff-quality runs
 2014-10-27 07:06:58 -04:00
Tim Babych
8fbdf712fa Merge pull request #5698 from edx/tim/django-1.4.16 
Update django version to 1.4.16
 2014-10-23 16:46:41 +03:00
Anton Stupak
b12aa0b1b6 Merge pull request #5518 from edx/anton/requirejs-optimizer 
Add RequireJS Optimizer.
 2014-10-23 15:29:42 +03:00
Tim Babych
693089e4a1 Update django version to 1.4.16 2014-10-23 11:54:18 +03:00
Don Mitchell
98f962274c Update opaque_keys to new release 2014-10-21 09:30:33 -04:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children 
Enable pure XBlocks to use children in edx-platform
 2014-10-16 10:23:35 -04:00
Calen Pennington
4d653d5359 Set xmodule_runtime on all XModule-like things (including pure XBlocks using the XModuleMixin) 
Expose xmodule_runtime as .runtime if it's set (otherwise, fall back to
the supplied runtime). This causes all blocks to act like XModules when
they have a ModuleSystem, and like XModuleDescriptors if they only have
a DescriptorSystem.
 2014-10-16 09:09:20 -04:00
Calen Pennington
47a3172bf1 Enable parent/child tests using the acid XBlock. 
Also fix those tests to correctly wait until the ajax portions have
finished before evaluating the page contents.
 2014-10-16 09:08:54 -04:00
Ben Patterson
6bcaf61b0c Introduce new switch for paver run_quality command. 
When using -p, the underlying diff-quality command will pass that
number as a value for --fail-under.

For example,
  paver run_quality -p 75

Will pass 75 into the --fail-under switch on diff-quality.

Also upgrades diff-cover in order to take advantage of this funcitonality.
 2014-10-15 12:40:59 -04:00
Will Daly
ad11c1b6f4 Update django-countries to 2.1.2, override country name for Taiwan 2014-10-14 13:12:36 -04:00
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