cahrens
ee836d4c40
Merge branch 'release' from 2014-08-12 release.
2014-08-12 13:51:58 -04:00
Ivica Ceraj
be17040f9d
Fix for empty imsx_messageIdentifier
2014-08-12 08:30:33 -04:00
Calen Pennington
25963797c6
Merge pull request #3227 from FiloSottile/enforce_type
...
Enforce type of the XBlocks Fields when set
2014-08-11 16:13:53 -04: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
Diana Huang
83f7acffca
Merge pull request #4764 from edx/diana/show-cert-without-end-date
...
Show Certificates Before End
2014-08-08 15:36:39 -04:00
Don Mitchell
21c6812bd3
More branch override precedence refinement
2014-08-08 15:00:48 -04:00
Don Mitchell
67d6347e50
Use continue version for create course side effects
2014-08-08 15:00:48 -04:00
Nimisha Asthagiri
ba8d390fd7
Support import of ErrorDescriptors.
2014-08-08 15:00:48 -04:00
Don Mitchell
7a75b94ff7
Support xml blocks w/ multiple parents
2014-08-08 15:00:47 -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
Diana Huang
0c3c7b5ab5
Merge pull request #4754 from edx/diana/show-cert-without-end-date
...
Show Certificates Before End
2014-08-08 14:58:02 -04:00
Don Mitchell
5fc30dc4f6
Move about overview creation to common superclass
2014-08-08 14:56:57 -04:00
Nimisha Asthagiri
70c77f48b8
fixup - re-enable Asset checking.
2014-08-08 14:54:15 -04:00
Don Mitchell
9254cfa9ce
Import depth first to help w/ publishing
2014-08-08 14:53:37 -04:00
Don Mitchell
2726b437bc
Trying to get split to work
2014-08-08 14:53:37 -04:00
Calen Pennington
b87d469c89
Add make_course_key to modulestores, so that external clients don't need to assume a CourseKey subtype.
...
Conflicts:
common/lib/xmodule/xmodule/modulestore/xml_importer.py
2014-08-08 14:44:53 -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
Diana Huang
7865e2fb3c
Move certificates_show_before_end into a new variable
...
Mark it as deprecated, but maintain backwards compatibility.
ECOM-11
2014-08-08 14:29:57 -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
Filippo Valsorda
a9930bf34a
Make enforce_type an optional flag, to avoid conflicts
2014-08-08 09:14:10 -07:00
Filippo Valsorda
5edfc479b1
Add xmodule fields enforce_type tests
2014-08-08 09:14:10 -07:00
Filippo Valsorda
0482038756
Enforce type of the XBlocks Fields when set
...
This updates the XBlock dependency to edX/XBlock@***
and add the newly introduced enforce_type methods
2014-08-08 09:14:10 -07:00
Nimisha Asthagiri
775b50a736
Address code coverage and quality.
2014-08-08 08:31:14 -04:00
Nimisha Asthagiri
934d4e8a23
Make Split Course work with new Publishing UI.
2014-08-07 20:23:44 -04:00
Nimisha Asthagiri
f10bcc1eb6
Fix get_courses.
2014-08-07 20:10:10 -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
Nimisha Asthagiri
a55b406c53
LMS-11177 Add Split to configuration settings.
2014-08-07 17:59:37 -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
polesye
61c417f7f4
STUD-2021: Fix Multiple Choice Options in Studio.
2014-08-07 12:27:23 -04:00
cahrens
121922a316
Fix rebase issue.
2014-08-07 12:27:17 -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
Ben McMorran
fdc79b3050
Adds edit info to instantiated xblock in update_item
2014-08-07 12:27:12 -04:00
cahrens
327a97f7c6
Failing test for create_item populating edit information.
2014-08-07 12:27:11 -04:00
cahrens
285beb388f
Clean up from rebase with master.
2014-08-07 12:26:50 -04:00
Ben McMorran
436d773987
Displays release date of unit in sidebar
2014-08-07 12:16:20 -04:00
cahrens
005491587f
Updates for create_and_save_xmodule doing an extra lookup.
2014-08-07 12:16:20 -04:00
cahrens
7cb5c4d7b8
Updates based on merge with master.
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
Waqas Khalid
3d5dde8195
Fix inconsistent ui issues on discussion during blackout period
...
FOR-108
2014-08-07 19:33:40 +05:00
clytwynec
22582f4931
Merge pull request #4634 from edx/clytwynec/removing_remaining_rake_references
...
removing rake and outdated references to it
2014-08-06 10:20:30 -04:00
jmclaus
9f313fcbdd
Merge pull request #4613 from edx/jmclaus/easy-access-group-configurations-page
...
BLD 1020: Easy access to Group Configurations page from Content Experiment component.
2014-08-05 23:45:55 +02:00
jmclaus
459c241e3b
BLD 1020: Easy access to Group Configurations page from Content Experiment component.
2014-08-05 19:44:21 +02:00
