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

11549 Commits

Author SHA1 Message Date
Matt Drayer
289ec980a5 mattdrayer/update-num-queries-check: Modify value to reflect improved workflow(s) 2015-07-02 18:03:57 -04:00
David Ormsbee
db3de51ad4 Merge pull request #6190 from mitocw/bdero/import-export-api 
Public Course Import/Export API
 2015-07-02 16:29:41 -04:00
Matt Drayer
1ca37737e9 Merge pull request #8566 from edx/ziafazal/SOL-980 
ziafazal/SOL-980: Generate certificates from instructor dashboard
 2015-07-02 16:07:33 -04:00
Will Daly
bfe01605b4 Merge pull request #8700 from edx/will/remove-provider-course-m2m-relation 
Credit eligibility/provider refactor
 2015-07-02 12:36:37 -07:00
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
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
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
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
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
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
Andy Armstrong
85814f0bbf Support running Studio with optimized assets 2015-07-01 18:22:31 -04:00
Christine Lytwynec
e9e4e3cf65 use 1 coveragerc file to generate 1 coverage report per build 2015-07-01 16:07:49 -04: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
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
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
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
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
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
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
Braden MacDonald
49d200c7ec Improve screen reader user experience on logistration page 2015-06-29 14:38:41 -07:00
Adam Palay
4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 
Conflicts:
	requirements/edx/github.txt
 2015-06-29 16:55:57 -04:00
Frances Botsford
15b9104471 generic and Team card/listing FED 
adjusting styles for teams cards
 2015-06-29 16:14:07 -04:00
Adam Palay
61431015c2 update xblock only to mark field values as dirty if they've changed (TNL-2475) 
force save "download_video" field if not set

set timezone to UTC explicitly
 2015-06-29 14:28:45 -04:00
Christopher Lee
a26b00ba41 Merge pull request #8656 from edx/gprice/discussion-api-set-group-id 
Allow group_id to be set in discussion API
 2015-06-29 12:02:29 -04:00
Awais Qureshi
1aa074da8a Merge pull request #8606 from edx/awais786/ECOM-1597-min-grade-update-with-signals 
Awais786/ecom 1597 min grade update with signals
 2015-06-29 20:26:34 +05:00
Greg Price
b8576e74d6 Allow group_id to be set in discussion API 
This also fixes two bugs:
* A thread created by a non-privileged user in a cohorted course would
  not have group_id set
* Any user could set the endorsed field on creation of a comment
 2015-06-29 11:08:03 -04:00
Jonathan Piacenti
412f120547 Make resetting of attempts and student state on blocks recursive. 2015-06-29 13:08:01 +00:00
cahrens
a4da143ca6 Delete unused student_profile code (WIP profile). 2015-06-29 08:56:11 -04:00
Sarina Canelake
65d68a888f Merge pull request #8694 from edx/sarina/default-OpenedX-no-search 
Set Courseware Search to False in default devstack, because it doesn't work.
 2015-06-29 07:45:34 -04:00
Davorin Sego
2c22a4d879 Responsive Homepage Hero, Header, Footer 2015-06-29 12:14:55 +02:00
dino-cikatic
f5275a54e8 Merge pull request #8575 from edx/dcikatic/fix-search-engine-set 
Fix SEARCH_ENGINE set logic in settings files
 2015-06-29 12:06:39 +02:00
Awais
b8e04f30a1 ECOM-1597 adding signals to update min-grade requirement. 2015-06-29 15:01:19 +05:00
Sarina Canelake
e83e88172b Don't i18n test files 2015-06-26 17:50:21 -04:00
Braden MacDonald
072ae99d12 Merge pull request #8140 from edx/feature/shibboleth-tpa 
Feature: Shibboleth/SAML SSO
 2015-06-26 14:17:24 -07:00
David Ormsbee
936256715d Merge pull request #8620 from mcgachey/lti-deployment 
[LTI Provider] Added an authentication backend to log in LTI users
 2015-06-26 17:16:52 -04:00
Frances Botsford
9969549b3a fix for instr dash and wiki responsive 2015-06-26 17:04:20 -04:00
Braden MacDonald
cf308d87b9 New Hinted Login View - PR 8591 2015-06-26 13:24:01 -07:00
Braden MacDonald
7437bcfe12 New provider config options, New Institution Login Menu - PR 8603 2015-06-26 13:24:01 -07:00
Braden MacDonald
00226bf3c0 Asynchronous metadata fetching using celery beat - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
cd941eada7 New SAML/Shibboleth tests - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Braden MacDonald
caca3e1bdf SAML2 third_party_auth provider(s) - PR 8018 2015-06-26 13:23:59 -07:00
Chris
454986a029 Merge pull request #7589 from jolyonb/jbloomfield/printing-checkmarks 
Making background pictures printable
 2015-06-26 16:20:34 -04:00