Update to release-2015-11-09 #31
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Refactor has_access for re-usability.
These endpoints (`edit_circuit` and `save_circuit`) had already been commented out of `urls.py`, so these views were disabled.
for hanging indent
Programs: added platform support package and configuration model.
…pdate SOL-1312 nit clean
Rc/2015 10 27
team not automatically enrolled in course
…reate-ccx Enroll the coach in the CCX on creation
Reusable Graph Traversals
…rallelism Adjust circleCI config for parallelism
This mapping API enables the mapping between the edX user ID and the ID provided by identity provider (IdP). For details, please see https://github.com/edx/edx-platform/pull/9842
Implement third party auth ID mapping API
Different modulestores create different usage_keys for the root course block. This commit introduces a new method on the modulestore so each store type can implement its own. This is required by the new Course Blocks API since it wants to derive a usage key from a client-supplied course key.
MA-1359 & MA-1457 DiscussionAPI: return response_count for thread GET/POST
…G is True ECOM-2547
Update newrelic plugin version.
* The LMS now also monkey-patches xmodule.x_module.descriptor_global_handler_url and xmodule.x_module.descriptor_global_local_resource_url so that we can get LMS XBlock URLs from the DescriptorSystem. That functionality is needed in the block transforms collect() phase for certain XModules like Video. For instance, say we want to generate the transcripts URLs. The collect phase is run asynchronously, without a user context. * The URL handler monkey-patching is now done in the startup.py files for LMS and Studio. Studio used to do this in the import of cms/djangoapps/contentstore/views/item.py. This was mostly just because it seemed like a sane and consistent place to put it. * LmsHandlerUrls was removed, its handler_url and local_resource_url methods were moved to be top level functions. The only reason that class existed seems to be to give a place to store course_id state, and that can now be derived from the block location. * To avoid the Module -> Descriptor ProxyAttribute magic that we do (which explodes with an UndefinedContext error because there is no user involved), when examining the block's handler method in handler_url, I made a few changes: ** Check the .__class__ to see if the handler was defined, instead of the block itself. ** The above required me to relax the check for _is_xblock_handler on the function, since that will no longer be defined. 90% of this goes away when we kill XModules and do the refactoring we've wanted to do for a while.
…-photo-id-for-initial-verfication Added photo_id_key while AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING is True
Flaky's latest release includes support for multiprocessing in nose. Upgrading in order to further the end-goal of providing multiprocessing capability in our bok-choy test suite.
Fix for PLAT-881: Disable CallStackManger from StudentModule
The receipt page now retrieves data for orders instead of baskets. Going forward baskets will be deleted after an order has been placed, so there should be no permanent references to baskets. Orders will continue to be persisted permanently. ECOM-2653
Upgrade flaky for multiprocessing nose support.
…t-page Updated receipt page to use order endpoint
Add make_course_usage_key method to modulestore
Course Blocks API
- Using raw ID field for user fields for enrollment and user profile admin - Including user data in enrollment admin queryset
…to_release asadiqbal08/SOL-1379 - Removed the limit on the number of lines in a title.
…outing change 'routing' for some reports which go to potentially backlogged …
Fixed admin issues
This reverts commit bc6caea.
This reverts commit 99cca05.
Fix optimizing of draggabilly and json2
…-on-save Revert disable check button on save
Release for Nov 09, 2015
tusbar
force-pushed
the
tusbar/pre-dogwood
branch
3 times, most recently
from
9bc9aa6
to
736d62a
Compare
tusbar
force-pushed
the
tusbar/pre-dogwood
branch
4 times, most recently
from
56b1ec6
to
2e2ed09
Compare
tusbar
force-pushed
the
tusbar/pre-dogwood
branch
from
2e2ed09
to
b10113e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.