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

2351 Commits

Author SHA1 Message Date
cahrens
ee836d4c40 Merge branch 'release' from 2014-08-12 release. 2014-08-12 13:51:58 -04:00
Tim Babych
e7fbf1327f Merge pull request #4778 from edx/tim/improve-python-group-configuration-tests 
Use UrlResetMixin to test GroupConfiguration feature
 2014-08-11 21:10:47 +03:00
Don Mitchell
05bddae34a Merge pull request #4633 from edx/dhm/create_xthing 
Make import/export work with split mongo, replace create_xmodule with create_xblock
 2014-08-11 12:53:59 -04:00
Don Mitchell
192d701899 Code review changes re split import/export, create_xblock 2014-08-11 12:13:31 -04:00
Tim Babych
06cb6008f0 Use UrlResetMixin to test GroupConfiguration feature 2014-08-11 19:12:30 +03:00
Alexander Kryklia
9643120390 Reenable user partition in Advanced Settings. 2014-08-11 16:41:29 +03:00
Muhammad Ammar
936bd4d5ad Bok-Choy CMS Video Tests 2014-08-11 07:50:19 +00:00
Don Mitchell
f69ef41c21 Disable fetching by version guid for now 2014-08-08 15:00:48 -04:00
Don Mitchell
ae4277c402 Use new check counter & bump count 2014-08-08 15:00:48 -04:00
Don Mitchell
e900a47b3f Provide workarounds for skip_draft where other code doesn't want its behavior 2014-08-08 15:00:47 -04:00
Don Mitchell
2726b437bc Trying to get split to work 2014-08-08 14:53:37 -04:00
Nimisha Asthagiri
84992cdfa5 Refactor xml_importer.py for easier reading. 
Remove post-publish step.
 2014-08-08 14:41:57 -04:00
Don Mitchell
47851c5041 Replace create_xmodule with create_xblock 
Refactor all callers (often replacing with more appropriate fn)

Also, added for_branch_setting method to old mongo and removed some
branch verification tests

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2014-08-08 14:40:27 -04:00
Oleg Marshev
0577b9d8b9 Allow turning off Video CDN in Studio. 
BLD-1207
 2014-08-08 14:39:19 -04:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
Nimisha Asthagiri
775b50a736 Address code coverage and quality. 2014-08-08 08:31:14 -04:00
Nimisha Asthagiri
abbfa95e4c LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL. 
Make default_store thread-safe.
 2014-08-07 18:07:41 -04:00
Nimisha Asthagiri
e9db4ad16d LMS-11019 Add feature flag to create Split Course 2014-08-07 18:07:01 -04:00
Nimisha Asthagiri
ec3011635d LMS-11179 Fix Assets with Split 2014-08-07 17:59:38 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Ben McMorran
f3070e6796 Reduce mongo calls on course outline and container pages 2014-08-07 12:27:38 -04:00
cahrens
932a130b16 pep8/pylint 2014-08-07 12:27:36 -04:00
cahrens
04be309ec4 Cleanup from rebase. 2014-08-07 12:27:28 -04:00
Tim Babych
ef9cf87b01 Compute graders just once per Course. 2014-08-07 12:27:26 -04:00
Tim Babych
d7f75778dd Pass parent_xblock to xblock_studio_url to avoid unnecessary calls to get_parent_xblock. 2014-08-07 12:27:26 -04:00
Tim Babych
8d0e469cd3 Remove code and template responsible for subsection edit page 2014-08-07 12:27:25 -04:00
cahrens
650bdc2fe7 Drag and drop support on the course outline page. 2014-08-07 12:27:24 -04:00
polesye
e8ae3d1b4a Fix Group Configuration Page after rebase. 2014-08-07 12:27:23 -04:00
Alexander Kryklia
a63cc0b30f Edit section/subsection release dates and grading types. 
Fix bok_choy test by changing course separator.
Change format of the modal title to '[Subsection/Section Name] Settings'.
Improve bok_choy test stability.
Studio: correcting modal window size name for outline settings editor
Specify full date in bok_choy tests.
Refactor bok_choy tests.
Remove .modal-editor from basic-modal.underscore
Set classes in modal window dynamically.
Studio: revising outline edit modal tip content and overall size
Rename isEditable to isEditableOnCourseOutline.
Interpolate display name.
Use graded instead of format as flag.
Studio: revising outline settings edit modal size
Fix selectors in bok_choy tests.
 2014-08-07 12:27:17 -04:00
Daniel Friedman
8ca4c68580 Reduce parent/child lookups in create_xblock_info 
STUD-1997
 2014-08-07 12:27:16 -04:00
Daniel Friedman
529672ac0c Reduce calls to expensive methods in create_xblock_info 
Special-case the outline page requests.

STUD-1997
 2014-08-07 12:27:16 -04:00
Daniel Friedman
2118453e00 Include edited/published_by for container page only 2014-08-07 12:27:15 -04:00
Ben McMorran
4ee8256c97 Add test fixes and fix expand collapse behavior 
Stop propagation of clicks in XBlockStringFieldEditor
Fix collapsed subsections expanding when creating or deleting subsections
Prevent clicking in display name textbox from toggling expand collapse
Add test for published title when not live
 2014-08-07 12:27:15 -04:00
cahrens
6d82cf09a4 Correct publish titles, code review feedback. 2014-08-07 12:27:14 -04:00
Andy Armstrong
ef581e1146 Apply code review comments and fix tests 2014-08-07 12:27:14 -04:00
Andy Armstrong
a359065329 Integrate visual styling into the course outline 2014-08-07 12:27:13 -04:00
Mark Hoeber
9524c212d6 Fix help test 
organizing_course -> outline
 2014-08-07 12:27:12 -04:00
Ben McMorran
73bd863712 Fix staff outline bug 2014-08-07 12:27:11 -04:00
cahrens
d447c07540 Support staff locking on the unit page 
STUD-1873
 2014-08-07 12:16:22 -04:00
Andy Armstrong
d2b61f146f Support faster deletes of sections 2014-08-07 12:16:21 -04:00
Ben McMorran
436d773987 Displays release date of unit in sidebar 2014-08-07 12:16:20 -04:00
Andy Armstrong
f061bbc08b Backbone version of the course outline page 
STUD-1726
 2014-08-07 12:16:20 -04:00
Andy Armstrong
49e0c642e2 Fix test that broke on rebase 2014-08-07 12:16:19 -04:00
cahrens
0f6de7f922 Discard changes rewrite. 
STUD-1860
 2014-08-07 12:16:19 -04:00
Ben McMorran
572b4fc030 Displays the date, time, and username of the most recent save and publish 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
 2014-08-07 12:16:19 -04:00
cahrens
7cb5c4d7b8 Updates based on merge with master. 2014-08-07 12:16:18 -04:00
Ben McMorran
d40ef5e089 Adds warning when editing a container visible to students 
styling for editing a live unit
 2014-08-07 12:16:18 -04:00
cahrens
d6475f4558 New publishing controls on unit page (continued) 
STUD-1707
 2014-08-07 12:16:18 -04:00
Andy Armstrong
d65e887d1a New Publishing controls on Unit page. 
STUD-1707
 2014-08-07 12:16:17 -04:00
Andy Armstrong
b1eccdf2d4 Replace unit page with the container page. 
STUD-1754
 2014-08-07 12:16:17 -04:00