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
Will Daly
06ddb2f359
Credit requirement optimizations
...
* Skip adding the credit req tasks to the queue for non-credit courses.
* Load only ICRV XBlocks instead of traversing the course tree.
2015-07-02 11:35:46 -07:00
Zia Fazal
611d16b25a
ziafazal/SOL-980: Generate certificates from instructor dashboard
...
* added generate certificates task and bok choy tests
* added unit tests
* changes based feedback and improved acceptance test
* Change header text
* changes based on feedback on 24/6
* added task_id to api output
* fixed broken test
* Remove "Instructor" from strings, per Docs team
* Fixed flaky entrance exam test
2015-07-02 14:32:36 -04:00
Daniel Friedman
d87a0f146b
Update docs for testing common requirejs tests
2015-07-02 14:12:32 -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
Alison Hodges
8ef05e0484
Carol's edits
2015-07-02 13:29:35 -04:00
Will Daly
e2acf3ab87
Credit eligibility/provider refactor
...
* Remove m2m relation between credit course and credit providers.
* Separate eligibility and provider APIs into different modules.
* Add API call for retrieving a user's eligibilities.
* Cache credit course list.
* Style the dashboard purchase button.
* Display a link for the credit provider on the dashboard.
* Add analytics events for clicks on the purchase button.
* Expose more credit models to Django admin and add search functionality.
2015-07-02 10:03:52 -07: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
Sarina Canelake
39334db4a4
Merge pull request #8707 from edx/rc/2015-06-29
...
Rc/2015 06 29
2015-07-02 11:08:11 -04:00
Alison Hodges
9f08e78705
fixed trailing white space errors
2015-07-02 10:52:37 -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
zubair-arbi
e369939b4b
change redirect url from '/accounts/login' to '/login'
...
ECOM-1734
2015-07-02 18:44:10 +05:00
Alison Hodges
8ccc27b427
fix pep8 violations
2015-07-02 09:15:05 -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
Alison Hodges
7410286104
Fixed pylint line-too-long violations
2015-07-01 15:23:15 -04: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
Alison Hodges
e473022c91
Additional references to "Pending Instructor Tasks" changed
2015-07-01 12:49:59 -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
Akiva Leffert
07fda73ffa
Remove border from chromeless xblock
...
JIRA: https://openedx.atlassian.net/browse/MA-972
2015-07-01 12:11:15 -04:00
Davorin Sego
e171d8842f
Fixes header styling issue introduced in SOL-734 ( #8389 ) by reverting heights to what they were before that PR
2015-07-01 17:29:25 +02: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
Alison Hodges
473b43cba0
missing quote catch by Christine
2015-07-01 10:38:42 -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
Alison Hodges
91955d43bf
Mark's edits
2015-07-01 10:00:38 -04: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
Marco Morales
51e47cf94f
fixup! removed css comments from _courses.scss, fixed rebase issue which resulted in having only 1 course on tablet (medium) size layouts
2015-07-01 13:46:56 +02:00
Chris Dodge
b741ce786b
fix python unit tests
2015-07-01 13:46:55 +02:00
Davorin Sego
2972e9110c
search input element styling improvements, test clean up
2015-07-01 13:46:55 +02:00
Marco Morales
b9ed758246
Initial syles cleanup and changes for course discovery on openedx
2015-07-01 13:46:54 +02:00
Awais Jibran
e64ae13a34
Fixed randomized problems which were not appearing to work.
...
TNL-2551
2015-07-01 16:34:34 +05:00
Zia Fazal
ad1f4951fc
get_certificate_url should return certificate download_url in case of non html certificates
2015-07-01 16:14:37 +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
