Commit Graph

202 Commits

Author SHA1 Message Date
Ned Batchelder
35c28e55b1 Use the latest django-wiki revision. 2014-02-10 15:23:13 -05:00
Calen Pennington
b0bed170de Enable (and test) xml export of pure XBlocks
[LMS-179]
[LMS-209]
[LMS-1345]
2014-02-05 13:02:40 -05:00
Will Daly
eae4adeb9b Merge pull request #2361 from edx/will/bok-choy-upgrade-and-lms-tests
Bok-choy upgrade, LMS tests, cleanup
2014-02-03 08:11:03 -08:00
Will Daly
89c029d281 Pinned version of sure library 2014-02-02 18:17:45 -05:00
Will Daly
577c77f080 Added sphinx_rtd_theme to requirements 2014-02-01 14:34:24 -05:00
Will Daly
e859a37001 Fix an issue with cache being cleared for bok_choy fast test
Change text in bok_choy scripts to green
Added feedback check for AI-assessment test
Added peer assessment feedback test
Updated Studio/LMS page objects and tests to use bok-choy v0.1.0
Added LMS bok-choy tests from e2e repo
2014-01-31 14:33:24 -05:00
Calen Pennington
ce19f2887c Merge pull request #2294 from cpennington/language-dark-launch
Add the ability to dark-launch languages
2014-01-29 10:52:06 -08:00
jorr-at-google
87aa71c450 Merge pull request #2309 from edx/jorr/feature/use-xblock-publish-api
Use the publish() api from xblock.runtime.Runtime
2014-01-29 09:25:33 -08:00
Calen Pennington
d379b35fa9 Add config_model, a library for database backed configuration
ConfigurationModels can be managed using the admin site. They are
append-only, and track the user who is making the change, and the time
that the change was made. The configuration is stored in the database,
and cached for performance.

[LMS-1220]
2014-01-29 09:17:19 -05:00
Will Daly
382fa9be1f Pin subunit and testtools libraries to prevent test failures after release of these libraries on 1/29/14 2014-01-29 08:08:40 -05:00
jorr
58c76afa9e Use the publish() api from xblock.runtime.Runtime 2014-01-28 14:16:34 -08:00
David Baumgold
78963565b8 Moved brew-formulas.txt to Brewfile
http://robots.thoughtbot.com/brewfile-a-gemfile-but-for-homebrew
2014-01-27 10:51:31 -05:00
Calen Pennington
cb77826a4d Merge pull request #2257 from cpennington/test-compiled-translations
Add tests of compiled translated strings, so that we can check them into the repo safely.
2014-01-23 07:22:24 -08:00
Calen Pennington
efa2cafa07 Upgrade the transifex client 2014-01-22 14:51:35 -05:00
Ned Batchelder
a2145c059e Add a setup.py so we can import top-level directories. 2014-01-22 12:33:45 -05:00
Greg Price
7515decebd Upgrade mako
This is necessary to pick up a bug fix for extraction of translator
comments.
2014-01-21 15:28:39 -05:00
Adam Palay
981a7f9479 Revert django-debug-toolbar related updates on master, set version to 0.9.4
(STUD-1201)

Revert "Specific django-toolbar version (stable released) and update the panels in dev envs"

This reverts commit a465b082da.

Revert "Updated settings for devstack django debug toolbar"

This reverts commit 30199e8a61.
2014-01-17 14:17:38 -05:00
Cristian Salamea
a465b082da Specific django-toolbar version (stable released) and update the panels in dev envs 2014-01-16 14:11:17 -05:00
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