Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
31,271 Commits 1 Branch 0 Tags
85b3bfe4f6512e4e03d3c26793ed5ad095d73993
Commit Graph

31271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon DeRosier
85b3bfe4f6 Add feature flag for Import/Export API in LMS 
This feature flag gates the exposure of the Full course/library
Import/Export API URLs in the LMS. This allows openedX deployments
that operate without Studio to take advantage of the API, while
others may turn the feature off to reserve all content authoring for
Studio.
 2015-07-02 15:32:00 -04:00
Brandon DeRosier
c94abd2705 edX Course/Library Import/Export API 
This is a public, versioned, RESTful API for importing and
exporting full course content. The code was initially ripped from the
existing import/export API in the CMS contentstore djangoapp and wrapped
in Django Rest Framework view classes. It's a new djangoapp in
the openedx directory which is largely an abstraction off the CMS
Import/Export views.

This PR includes configuration changes. Most notably, Studio is
configured to serve the OAuth2 provider alongside the LMS.

This is the initial thread on the code list:
https://groups.google.com/forum/#!msg/edx-code/DmnHWmly25A/ZqjD1zb4o7oJ

And this thread contains another description of the changes:
https://groups.google.com/d/msg/edx-code/6dP9SEKsmqQ/Pvyn8fBDx68J

There are a numerous non-covered lines, all of which are missing
coverage in the CMS API this was ported from. They're mostly error
conditions, such as handling of multipart file upload errors.
 2015-07-02 15:32:00 -04:00
Matt Drayer
4526b929b0 Merge pull request #8491 from edx/mattdrayer/fix-progress-template 
mattdrayer/SOL-1018: Fixed progress template for better web certificates support
 2015-07-02 13:51:49 -04:00
Calen Pennington
012a3c7540 Merge pull request #8725 from openfun/regisb/fix_xblock_class_loading 
Fix XBlock class loading in local resource view
 2015-07-02 13:37:03 -04:00
Ali Mohammad
eb70f2303c Merge pull request #8749 from edx/rc/2015-06-29 
Merge back into master
 2015-07-02 13:34:42 -04:00
Christine Lytwynec
0bb519c2a0 Merge pull request #8727 from edx/clytwynec/TE-878 
use 1 coveragerc file to generate 1 coverage report per build
 2015-07-02 12:13:59 -04:00
Sarina Canelake
64a142d0e6 Merge pull request #8763 from edx/sarina/mark-tests-as-flaky 
Mark test as flaky; TNL-2647
 2015-07-02 12:08:27 -04:00
frances botsford
05249d590f Merge pull request #8697 from edx/frances/fix/lmsbigwindow 
InstrDash and Wiki content responsive
 2015-07-02 11:40:20 -04:00
Andy Armstrong
281ebaa3b3 Merge pull request #8683 from edx/andya/run-optimized-devstack 
Support running Studio with optimized assets
 2015-07-02 11:39:37 -04:00
Sarina Canelake
d5b26c7f8c Mark test as flaky; TNL-2647 2015-07-02 11:18:09 -04:00
Jesse Zoldak
3de778b78c Merge pull request #8757 from edx/zoldak/7000 
Lower pylint threshold to 7000!
 2015-07-02 10:43:27 -04:00
Jesse Zoldak
7a852b0b1c Lower pylint threshold to 7000! 2015-07-02 09:04:28 -04:00
Andy Armstrong
85814f0bbf Support running Studio with optimized assets 2015-07-01 18:22:31 -04:00
Ned Batchelder
9d5b5658a4 Merge pull request #8552 from edx/ned/smarter-mako-caching 
Make edxmako cache properly with changing lookup paths
 2015-07-01 17:47:04 -04:00
Adam
10c9912b47 Merge pull request #8740 from edx/revert-8672-aj/tnl2551-randomized-problems-not-working 
Revert "Fixed randomized problems which were not appearing to work."
 2015-07-01 16:27:24 -04:00
Christine Lytwynec
e9e4e3cf65 use 1 coveragerc file to generate 1 coverage report per build 2015-07-01 16:07:49 -04:00
Awais Jibran
c93d48249d Fixed quality report 2015-07-02 00:29:50 +05:00
Awais Jibran
5306ac02b0 Revert "Fixed randomized problems which were not appearing to work." 2015-07-02 02:35:54 +05:00
Sarina Canelake
4f991ebaab Merge pull request #8718 from open-craft/smarnach/add-poll-xblock 
Add the Poll XBlock to the requirements.
 2015-07-01 14:00:42 -04:00
Sven Marnach
e8398b571e Add the Poll XBlock to the requirements and ADVANCED_COMPONENT_TYPES. 2015-07-01 18:34:10 +02:00
Braden MacDonald
cd3abf37cd Merge pull request #8733 from open-craft/fix-shibboleth-fetch 
Fix errors with fetching Shibboleth metadata
 2015-07-01 09:17:52 -07:00
Kelketek
c676bf0460 Merge pull request #8679 from open-craft/recursive_state_reset 
Make resetting of attempts and student state on blocks recursive. (SOL-858)
 2015-07-01 10:05:42 -05:00
frances botsford
b127bfe0c7 Merge pull request #8468 from edx/frances/teams-listings 
Team card/listing
 2015-07-01 11:04:10 -04:00
Awais Jibran
9e0ed9b759 Merge pull request #8672 from edx/aj/tnl2551-randomized-problems-not-working 
Fixed randomized problems which were not appearing to work.
 2015-07-01 19:04:36 +05:00
Peter Fogg
69b90275a3 Merge pull request #8690 from edx/peter-fogg/fix-passing-grades 
Fix not being able to set course passing grades above 80%.
 2015-07-01 09:56:21 -04:00
Peter Fogg
890cd6a470 Add grading spec tests. 2015-07-01 09:08:39 -04:00
Peter Fogg
46ea862f04 Fix not being able to set course passing grades above 80%. 2015-07-01 09:08:39 -04:00
Awais Jibran
e64ae13a34 Fixed randomized problems which were not appearing to work. 
TNL-2551
 2015-07-01 16:34:34 +05:00
Ahsan Ulhaq
36e31e10e4 Merge pull request #8687 from edx/ahsan/ECOM-1782-Order-Credit-Eligibility-line-items-progress-page 
Order of Credit Eligibility line items
 2015-07-01 14:45:33 +05:00
Ahsan Ulhaq
7787974dd5 Order of Credit Eligibility line items 
Displayed eligibility line items on the Progress page of a Credit course
in the order of appearance in the courseware.

ECOM-1782
 2015-07-01 13:40:39 +05:00
Braden MacDonald
4487b6d184 Fix errors with fetching Shibboleth metadata 2015-06-30 20:50:45 -07:00
Clinton Blackburn
1ee3094dd3 Merge pull request #8670 from edx/clintonb/course-mode-api 
Added Courses endpoint for Commerce API
 2015-06-30 23:29:55 -04:00
Clinton Blackburn
45de93a250 Added course endpoints for Commerce API 
XCOM-314
 2015-06-30 22:36:47 -04:00
Renzo Lucioni
39dadb57f0 Merge pull request #8698 from edx/renzo/fulfillment-logging 
Improve logging of ecommerce interactions
 2015-06-30 21:31:41 -04:00
Sarina Canelake
9ada9d6182 Merge pull request #8732 from edx/sarina/fix-log-messages 
Dark lang middleware: Check if user is authenticated
 2015-06-30 20:50:00 -04:00
Sarina Canelake
28a234380a Dark lang middleware: Check if user is authenticated 
Check if the request's user is authenticated before attempting to
get their user preferences. Otherwise, log warnings appear indicating
the UserNotFound error was caught.
 2015-06-30 20:01:00 -04:00
Ali Mohammad
f4bee50e6d Merge pull request #8730 from edx/mekkz/capa-image-input-fix 
TNL-2623 Fix bug where status icons were hidden in image response problems
 2015-06-30 18:53:39 -04:00
frances botsford
4df966d508 Merge pull request #8729 from edx/frances/fixes/ECOM-1808 
give the header the right height in the verify flow
 2015-06-30 18:30:51 -04:00
Sarina Canelake
5f95226b00 Merge pull request #8731 from Stanford-Online/aliang8/missing-comma 
Add missing comma to tuple
 2015-06-30 18:20:02 -04:00
Renzo Lucioni
d330831871 Improve logging of ecommerce interactions 
Adds standardized audit logging for checkout and enrollment change requests. XCOM-427.
 2015-06-30 17:34:16 -04:00
Albert Liang
fe19d0cc7e Add Albert Liang to AUTHORS 2015-06-30 14:17:14 -07:00
Kyle McCormick
6b70785c12 TNL-2623 Fix bug where status icons were hidden in image response problems 2015-06-30 17:09:20 -04:00
Albert Liang
4b332bfcf0 Add missing comma to tuple 
Currently, Python implicitly concatenates two string entries located next to
each other because there is no comma separating them.  The code concatenates
"*.pyc" and "sass/*.scss", creating a single entry called "*.pycsass/*.scss".
 2015-06-30 14:02:07 -07:00
Frances Botsford
e3080e6d0d give the header the right height in the verify flow 
ECOM-1808
 2015-06-30 16:17:00 -04:00
Braden MacDonald
e145d7f855 Merge pull request #8699 from open-craft/sso-a11y 
Improve screen reader user experience on logistration page
 2015-06-30 11:11:38 -07:00
Régis Behmo
bbe5494df1 Fix XBlock class loading in local resource view 
Some XBlock classes were being (randomly) incorrectly loaded. This was
due to an error in the way the XBlock.load_class method was called.
Error was happening randomly because of the cache mechanism in the class
loading method. (see PLUGIN_CACHE)
 2015-06-30 19:10:45 +02:00
Ali Mohammad
35f7cb75e4 Merge pull request #8715 from edx/resolve-merge-conflicts 
Resolve merge conflicts
 2015-06-30 11:00:50 -04:00
David Baumgold
a9c67c562e Merge pull request #8527 from edx/db/ensure-noseids-dir-exists 
Ensure noseid dir exists when running tests
 2015-06-30 10:03:56 -04:00
Muhammad Ammar
06a1486934 Merge pull request #8450 from edx/ammar/tnl2303-course-outline-ora1-warning-message 
Display message on course outline in Studio when course contains ORA 1
 2015-06-30 15:04:02 +05:00
muhammad-ammar
b0eda4cac9 Display warning message on course outline in Studio when course contains deprecated features/components 
TNL-2303
 2015-06-30 13:26:18 +05:00