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

3684 Commits

Author SHA1 Message Date
Calen Pennington
4f1a420a2a Use a version of ddt that supports unicode w/o requiring six at runtime 2014-01-15 15:34:35 -05:00
Alexander Kryklia
cbe97d6fe6 Merge pull request #1948 from edx/anton/allow-arbitrary-regex-in-stringresponse 
Anton/allow arbitrary regex in stringresponse
 2014-01-15 03:15:43 -08:00
polesye
ee1953b37a BLD-474: Allow multiple answers for string response. 2014-01-15 12:51:24 +02:00
Greg Price
72084e1f27 Refer to a ddt commit that actually exists 2014-01-14 17:28:10 -05:00
Calen Pennington
a55724d117 Prevent unicode data from being injected into a Location using the _replace function 2014-01-14 13:28:49 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00
Calen Pennington
2ad4749a5d Merge pull request #2119 from cpennington/xblocks-behind-feature-flag 
Enable pure XBlocks, hidden by feature flags
 2014-01-10 09:51:23 -08:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag 
[LMS-226]
[LMS-2013]
 2014-01-10 11:40:03 -05:00
Will Daly
4a9c239c3d Merge pull request #2030 from edx/will/bok-choy-integration 
Added configuration for running tests using the bok-choy framework
 2014-01-10 05:26:42 -08:00
Ned Batchelder
ef6c8a95e0 Update XBlock to version with Runtime.service 2014-01-09 13:56:20 -05:00
Will Daly
dde5455227 Added configuration for running tests using the bok-choy framework 2014-01-09 12:57:50 -05:00
Julia Hansbrough
e783d42cdb Merge pull request #2083 from edx/flowerhack/updated-codejail-reqs 
Updated codejail version
 2014-01-08 07:22:32 -08:00
Julia Hansbrough
dc53c7d2bc Updated codejail version 2014-01-06 21:51:42 +00:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page 
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
 2014-01-05 23:35:12 -05:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors 
[LMS-1614]
 2013-12-20 14:05:53 -05:00
Calen Pennington
a0b8577ac3 Merge pull request #1988 from cpennington/annotation-module-acceptance-tests 
Add acceptance tests of Annotatable module
 2013-12-20 11:00:41 -08:00
Will Daly
f58e788b83 Merge pull request #1971 from edx/will/selenium-pages 
Added Selenium page objects for LMS and studio
 2013-12-20 06:05:30 -08:00
Will Daly
04e66be705 Added Selenium page objects for LMS and studio 2013-12-19 16:21:06 -05:00
Calen Pennington
1d0ce64b10 Update to the latest version of lettuce 2013-12-17 13:18:22 -05:00
David Baumgold
132313c1bf Update version of django-staticfiles library 2013-12-16 16:12:15 -05:00
Carson Gee
ccc87337d6 Add sysadmin dashboard 
For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered
 2013-12-15 19:06:05 -05:00
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
David Baumgold
d15391fdfa Update factory_boy to 2.2.1 2013-12-05 15:50:49 -05:00
Ned Batchelder
c62abeddb7 Merge branch 'release' 2013-12-03 13:20:29 -05:00
Ned Batchelder
ddb2483367 Update the XBlock version. 2013-12-02 15:48:05 -05:00
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Calen Pennington
6d613f9d4e Enable un-authenticated handler urls 
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:34 -05:00
Jason Bau
f94565d699 Merge pull request #1685 from edx/jbau/shopping-cart/report 
CSV Reporting of Shopping Cart Purchases, with tests
 2013-11-26 11:45:59 -08:00
Ned Batchelder
1795e157be Upgrade coverage to 3.7 2013-11-25 16:38:16 -05:00
Ned Batchelder
75532987ce Properly convert files from Webob to pure files. 
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
 2013-11-22 11:47:34 -05:00
Ned Batchelder
de7d2cd08c Properly convert files from Webob to pure files. 
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
 2013-11-22 11:09:11 -05:00
Jason Bau
c8a98051dd CSV Reporting of Shopping Cart Purchases, with tests 
squashing to one commit to make cherry-picking by feature possible
 2013-11-18 14:45:41 -08:00
Will Daly
4e9de855d1 Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline 
Acceptance tests use asset pipeline
 2013-11-08 09:39:19 -08:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules 
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
 2013-11-08 11:08:48 -05:00
Will Daly
7830bb203f Acceptance tests use asset pipeline 2013-11-04 14:04:04 -05:00
Will Daly
57556c2473 Pin dateutil version to 2.1 2013-11-04 10:18:54 -05:00
e0d
b5fa050d3c updating boto to get boto.elasticache.layer1 2013-10-28 12:50:59 -04:00
Calen Pennington
ef75a05c9e Upgrade newrelic so that we can use the new histogram and percentile features 2013-10-24 14:49:48 -04:00
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles 
Add Timed Transcripts Editor.
 2013-10-23 02:38:39 -07:00
Jason Bau
6e1b8749b2 Merge pull request #1440 from edx/jbau/COE-sanitize-with-bleach 
Jbau/coe sanitize with bleach
 2013-10-22 14:01:59 -07:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
John Jarvis
4d21fa47d5 adding gunicorn to base requirements 2013-10-22 12:03:26 -04:00
Jason Bau
79ce043219 use bleach instead of lxml.html.clean for sanitize_html OEE 2013-10-21 21:03:30 -07:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution 
Add an XBlock javascript runtime, and use it to run XModules
 2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
Will Daly
7c15edf686 Use js-test-tool v0.1.4 2013-10-18 14:03:45 -04:00
Gabe Mulley
d2b03e28fb add course_id to event context 2013-10-17 17:44:01 -04:00
Will Daly
7316a3dc3b js-test-tool generates xunit reports. 2013-10-17 14:22:09 -04:00
Brian Wilson
7abd4e363d Switch to 0.2.6 version of diff-cover. 2013-10-10 15:34:16 -04:00
chrisndodge
82e42cc580 Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware 
add some middleware to determine whether draft modulestore or non-draft ...
 2013-10-10 10:24:51 -07:00