Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

268 Commits

Author SHA1 Message Date
muzaffaryousaf
71e267eb69 Changing the edx-submission repo version to the latest commit. 
TNL-1125
 2015-02-12 15:54:30 +05:00
Calen Pennington
b93b541733 Add our custom pylint plugin 
So far, it checks:

* Whether setUp is called in TestCase setUp methods.
* If _("translate me") functions are called with only string literals.
 2015-02-06 11:58:37 -05:00
Jesse Zoldak
1042e47e3c Revert "Add pylint plugin to check whether setUp is called in TestCase setUp methods." 
This reverts commit a92ca9d79a.
 2015-02-05 12:45:47 -05:00
Calen Pennington
a92ca9d79a Add pylint plugin to check whether setUp is called in TestCase setUp methods. 2015-02-04 09:09:14 -05:00
Greg Price
20eb84d431 Merge pull request #6828 from edx/gprice/video-upload-ordering 
Sort Studio video uploads by creation date
 2015-01-30 15:08:09 -05:00
Greg Price
3978d91644 Sort Studio video uploads by creation date 
This provides a better UX for video uploaders, because recent uploads
are readily visible at the beginning of the table.
 2015-01-30 13:23:44 -05:00
Adam Palay
bfcfbfab2f Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-01-30 09:44:42 -05:00
Braden MacDonald
da3a3c038c Bump XBlock version 2015-01-29 17:31:07 -08:00
Adam Palay
d4d785bfd7 update codejail (TNL-1248) 
(optionally use a proxy process to spawn subprocesses)
 2015-01-29 15:10:39 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Matt Drayer
9d2a0a4e9d Merge pull request #6705 from edx/mattdrayer/update-milestones-hash 
Bok Choy test now passes
 2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a Bok Choy test now passes 2015-01-28 17:37:49 -05:00
Christine Lytwynec
739322d469 Merge pull request #6780 from edx/clytwynec/update_bokchoy_version 
updating bokchoy version
 2015-01-28 16:30:51 -05:00
swdanielli
dbec1d6fc7 Fix recommenders' bugs: template_lookup initialization, syntax error, and the incompatibility of the underscore library 2015-01-27 15:47:52 -05:00
Christine Lytwynec
b7e5a52d1d updating bokchoy version 2015-01-27 10:06:23 -05:00
swdanielli
ed8fea79c2 update accessibility 2015-01-23 16:13:26 -05:00
Renzo Lucioni
c6777a5b25 Bok Choy tests for the split payment and verification flow 
Adds mode creation endpoint to course_modes app and ability to bypass media device access prompt when proceeding through verification flow in a testing environment.
 2015-01-15 17:25:25 -05:00
Matt Drayer
27fee62039 Merge pull request #6126 from edx/ziafazal/add-pre-requisite-course-via-milestones-app 
Ziafazal/add pre requisite course via milestones app
 2015-01-15 14:20:44 -08:00
Will Daly
572f155aad Merge pull request #6541 from edx/will/update-diff-cover 
Install diff-cover from pypi, update version to 0.7.3
 2015-01-15 17:09:43 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
John Eskew
6873c04599 First iteration of code which tests performance of asset metadata 
during course import/export. Uses external code_block_timer module.
   Also, add script which validates XML file against an XSD file.
   Uses the unittest framework - but is currently skipped.
 2015-01-13 08:47:24 -05:00
Will Daly
6c1a427d1c Install diff-cover from pypi, update version to 0.7.3 2015-01-10 13:38:01 -05:00
Ned Batchelder
a2c7b03cb9 Update CodeJail to get better status code when CPU limit is exceeded. 2015-01-05 12:32:11 -05:00
Usman Khalid
b13eef8859 Update edx-ora2 to release-2015-01-05T12.24. 2015-01-05 17:31:00 +05:00
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
Adam Palay
4d2df01d7d update ora version 2014-12-17 13:47:39 -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
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
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
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00