Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,540 Commits 1 Branch 0 Tags
f8cfdf0d83606ac09bcdfdace425bc28d02f0c3f
Commit Graph

536 Commits

Author SHA1 Message Date
Calen Pennington
a6035698d5 Correctly compute course image location when using mongo modulestore 
[LMS-2073]
[STUD-1197]
 2014-01-22 07:17:40 -05:00
Calen Pennington
923c2ff46e Add failing tests for course image names 
Tests LMS-2073 (non-ascii course image names) and STUD-1197 (spaces in
course image names)
 2014-01-22 07:16:30 -05:00
Christina Roberts
a3d22097b9 Merge pull request #2182 from edx/christina/duplicate 
Support duplicating an existing xblock to a supplied parent location.
 2014-01-16 11:04:39 -08:00
cahrens
81fecf3e6c Duplicate children so as to not create a DAG. 2014-01-16 11:24:35 -05:00
cahrens
0d8d7cb393 Support duplicating an existing xblock to a supplied parent location. 
STUD-1190
 2014-01-15 14:36:40 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones 
STUD-1006
 2014-01-14 17:04:44 -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
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
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
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
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
Don Mitchell
a46e112a04 Improve test coverage 
and fix found errors.
 2013-12-20 10:44:01 -05: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
Don Mitchell
3f420e3d63 loc_mapper memoize all translations 
STUD-1048
 2013-12-16 11:43:28 -05:00
cahrens
ec55d8c1a9 Create explicit Locations. 
STUD-1030
 2013-12-11 10:03:34 -05:00
Don Mitchell
b5691cd4d1 Upgrade pymongo usage from deprecated connection to client 
LMS-1551
 2013-12-06 10:47:06 -05:00
David Baumgold
0d3490374e Refactor textbooks to use locator URLs 
STUD-945
 2013-12-05 13:13:28 -05:00
David Baumgold
d1f3e3a6b5 Merge pull request #1827 from edx/db/remove-mitx-from-features 
settings.MITX_FEATURES => settings.FEATURES
 2013-12-04 07:13:19 -08:00
Christina Roberts
2682a14d43 Merge pull request #1790 from edx/christina/transcripts 
Change video transcripts to use locators instead of locations.
 2013-12-04 06:41:44 -08:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
Don Mitchell
9dc68b03a0 Improve auth handling of Locators 
Ensure user admin screen gets the union of all possibly matching group names.
Smarter default group naming.
STUD-1003
 2013-12-02 15:28:22 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
cahrens
5fdfc60957 Change video transcripts to use locators instead of locations. 
Part of STUD-870
 2013-11-26 16:52:56 -05:00
Don Mitchell
7f91ce40ae Restful api for course advanced settings 
STUD-948
 2013-11-26 10:17:52 -05:00
cahrens
b5d72a38d3 Updates from code review. Includes backing out the 
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
 2013-11-25 13:55:33 -05:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -05:00
Don Mitchell
17864353a5 Restful course settings 
STUD-946
STUD-947
 2013-11-22 10:55:35 -05:00
Christina Roberts
3f44ff2f4b Merge pull request #1675 from edx/christina/tab-new 
Convert tabs to use RESTful API
 2013-11-21 07:39:31 -08:00
cahrens
1b2be30c45 Convert tabs to RESTful URL. 
STUD-850
 2013-11-21 10:19:43 -05:00
cahrens
d1c19cb563 Minor cleanup around public RESTful URLs. 
STUD-849
 2013-11-20 14:20:59 -05:00
cahrens
f01b36b5d4 Test for i4x on returned pages. 
STUD-941
 2013-11-20 12:48:24 -05:00
Christina Roberts
c9416925e1 Merge pull request #1680 from edx/christina/preview 
Change preview view method to use RESTful URL.
 2013-11-20 06:12:19 -08:00
cahrens
e7c06e3ab1 Change preview view method to use RESTful URL. 
STUD-848
 2013-11-19 16:56:24 -05:00
Christina Roberts
d4082859f8 Merge pull request #1714 from edx/christina/fix-children 
The forcing of IDs to non-draft must happen in base.py instead of draft....
 2013-11-19 11:18:54 -08:00
cahrens
ed9a61e2d9 The forcing of IDs to non-draft must happen in base.py instead of draft.py. 
The draft.py solution only worked when the parent was also in the draft store.
 2013-11-19 12:08:29 -05:00
Mark Hoeber
4efafe4186 Merge pull request #1701 from edx/documentation/hoeber/stud-924 
Review all panel help text in Studio UI for Studio-924
 2013-11-19 08:22:36 -08:00