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

4229 Commits

Author SHA1 Message Date
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org 
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
 2014-01-14 14:36:01 -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
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -05:00
Will Daly
7adb48c0f0 Disabled static pages and course team test seen to fail in master 2014-01-13 14:14:52 -05:00
cahrens
38c516e9e9 Fix bug about draft verticals reordering. 
STUD-714
 2014-01-13 09:25:16 -05:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag 
[LMS-226]
[LMS-2013]
 2014-01-10 11:40:03 -05:00
Don Mitchell
a07896dacc Set definition_locator on in-memory xblocks 2014-01-09 12:39:39 -05:00
Don Mitchell
bccae306db Merge pull request #2111 from edx/dhm/drop_contentstore 
During testing: drop contentstore when cleaning up modulestore
 2014-01-08 11:37:42 -08:00
Don Mitchell
81a5b36363 During testing: drop contentstore when cleaning up modulestore 2014-01-08 12:05:32 -05:00
Andy Armstrong
93675304da Add sorting to Studio's Files & Uploads page 
Added sorting to the new pagination logic for STUD-995.
 2014-01-08 10:35:40 -05:00
David Baumgold
5d63cd0eb0 Merge pull request #2094 from edx/db/change-section-start-date 
Set default section start date to Jan 1, 2030
 2014-01-07 13:10:29 -08:00
David Baumgold
ce4b130113 Set default section start date to Jan 1, 2030 
STUD-1072
 2014-01-07 15:46:15 -05:00
Andy Armstrong
100ace64db Fix pagination test failures 
Updated the pagination tests to no longer use the toy course, but to instead explicitly upload the assets it needs.

 Added a new AssetsTestCase base class to own shared helper methods.
 2014-01-07 13:12:39 -05:00
Christina Roberts
c711bb6072 Merge pull request #2055 from edx/christina/amp 
Tests for behavior of export with & in HTML and XML-based components
 2014-01-07 07:35:58 -08:00
Andy Armstrong
430cfd7563 Merge pull request #2096 from edx/andya/pagination-fix 
Fix STUD-1129: handle out-of-range page numbers
 2014-01-07 06:55:22 -08:00
zubair-arbi
f71688ce42 Merge pull request #2075 from zubair-arbi/zub/bugfix/std878-wrongcontenttype 
Assign valid content_type to static resource (import_static_content)
 2014-01-06 23:35:44 -08:00
Andy Armstrong
089c2a0302 Fix STUD-1129: handle out-of-range page numbers 2014-01-06 18:00:32 -05:00
cahrens
a80101dda2 Don't add every helper method to world. 2014-01-06 11:48:40 -05:00
zubiar-arbi
b998a161d2 Assign valid content_type to static resource (import_static_content) 
STUD-878
 2014-01-06 14:05:09 +05: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
Gabe Mulley
b9096b1bb5 prevent failure when module does not have a data field 2014-01-03 10:49:00 -05:00
cahrens
0222e57cff Add acceptance test for behavior when & is in problem xml. 
Part of STUD-91
 2013-12-30 15:08:53 -05:00
polesye
b6808d3d13 BLD-541: Fix video controls on iPad. 2013-12-24 14:59:20 +02:00
Don Mitchell
f5f24fcc12 Merge pull request #2022 from edx/dhm/locator_course_id 
Change course_id to package_id
 2013-12-23 11:15:48 -08:00
Don Mitchell
b7368ef69a Change course_id to package_id 
on new Locators to make it clear that they have a different syntax
than Location.course_id altho they represent the same info.
 2013-12-20 16:16:50 -05:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors 
[LMS-1614]
 2013-12-20 14:05:53 -05:00
Christina Roberts
3c0df16b0c Merge pull request #2004 from edx/christina/fix-thumbnail-warning 
Properly format errors/warnings.
 2013-12-20 10:11:12 -08:00
Don Mitchell
6c4aae731a Merge pull request #1980 from edx/dhm/locator_block_id 
Rename BlockUsageLocator's block_id field from usage_id
 2013-12-20 08:52:46 -08:00
Don Mitchell
a46e112a04 Improve test coverage 
and fix found errors.
 2013-12-20 10:44:01 -05:00
Will Daly
d23f48f573 Merge pull request #2002 from edx/will/rebalance-shards 
Rebalance acceptance test shards
 2013-12-20 05:45:22 -08:00
cahrens
65756bbf94 Properly format errors/warnings. 
STUD-1063
 2013-12-19 16:52:20 -05:00
polesye
042cb5c698 BLD-206: Add template for the zooming image in Studio. 2013-12-19 21:47:32 +02:00
Will Daly
28e25b75ff Rebalance acceptance test shards 2013-12-19 10:41:45 -05:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor 
Stub Server Port Conflicts and Refactor
 2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain 
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
 2013-12-19 09:12:41 -05:00
polesye
70518a4659 BLD-506: Update behavior of start/end time fields. 2013-12-18 09:43:11 +02:00
Don Mitchell
b776590226 Rename BlockUsageLocator's block_id field from usage_id 
usage_id implies self-sufficiency. The block_id is relative to its structure.
 2013-12-17 12:15:32 -05:00
frances botsford
8a23f432c7 Merge pull request #1896 from edx/frances/fix/studio-outline-cleanup 
FED Cleanup of Studio Outline page
 2013-12-17 07:27:14 -08:00
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize 
loc mapper memoize
 2013-12-16 10:34:12 -08:00
Don Mitchell
f6de4f2186 Location map uses a separate cache and defaults to general 2013-12-16 12:31:19 -05:00
Don Mitchell
3f420e3d63 loc_mapper memoize all translations 
STUD-1048
 2013-12-16 11:43:28 -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
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes 
whitespace-only changes
 2013-12-13 11:40:54 -08:00
Don Mitchell
3bd76f98e9 Use mongo indices for all queries 
STUD-1039
 2013-12-13 14:34:34 -05:00
Don Mitchell
f4beb8b8c3 Reduce sql queries for groupname tests. 
Conflicts:
	cms/djangoapps/auth/authz.py
 2013-12-13 14:33:11 -05:00
Christina Roberts
17b5c2126c Merge pull request #1910 from edx/christina/locations 
Create explicit Locations.
 2013-12-13 09:18:21 -08:00
cahrens
ec55d8c1a9 Create explicit Locations. 
STUD-1030
 2013-12-11 10:03:34 -05:00
David Baumgold
2bc4198760 Merge pull request #1853 from edx/db/update-comments 
Updating comments and docs for MITx -> edX transition
 2013-12-10 11:10:37 -08:00
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
David Baumgold
28f22393bf whitespace-only changes 2013-12-10 11:45:49 -05:00