Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,903 Commits 1 Branch 0 Tags
f72cf800e1bfae5345776da4d03e804603c601cb
Commit Graph

43903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Mangano
f72cf800e1 Consider user entitlements and use entitlement products in bundle one-click purchase 2017-11-30 13:59:46 -05:00
Matt Tuchfarber
c25e4ba045 Merge pull request #16648 from edx/tuchfarber/add_price_to_marketing_button 
Add pricing data to program purchase button
 2017-11-30 13:11:06 -05:00
Calen Pennington
2ad918c126 Merge pull request #16707 from cpennington/cale/improve-schedule-admin-filtering 
Use a dropdown to filter schedules by course_id, rather than forcing …
 2017-11-30 12:49:06 -05:00
Eric Fischer
e1f02977d4 Merge pull request #16723 from edx/efischer/xss_limit 
unbreak master tests
 2017-11-30 11:58:47 -05:00
Eric Fischer
bc8fa5eaaa unbreak master tests 2017-11-30 11:03:41 -05:00
Calen Pennington
1f23b08fb1 Use a dropdown to filter schedules by course_id, rather than forcing the use of search 2017-11-30 10:53:08 -05:00
Nimisha Asthagiri
7a6805b261 Merge pull request #16714 from edx/pacing/spanish-language-issue 
Schedules: course language -> closest released language
 2017-11-30 10:47:53 -05:00
Jesse Zoldak
8a7275d635 Merge pull request #16709 from open-craft/uman/xsslint 
Fix some mako-missing-default xsslint issues in test files.
 2017-11-30 06:50:04 -08:00
Awais Jibran
e3c4b9f096 Merge pull request #16717 from edx/aj/update-course-start-date-change-log 
Add Course ID in logging
 2017-11-30 15:05:37 +05:00
Awais Jibran
f72d44d38a Add Course ID in logging 2017-11-30 13:48:06 +05:00
Nimisha Asthagiri
38cfadeb20 Schedules: convert course language to supported released language 2017-11-29 20:08:33 -05:00
Uman Shahzad
1ab92ee9f2 Fix an introduced xsslint issue. 2017-11-30 04:55:11 +05:00
Alessandro Roux
7463356c7f Merge pull request #16706 from edx/pacing/readme-with-a-system-diagram 
Dynamic Pacing: Incorporate handoff feedback in the README
 2017-11-29 16:42:34 -05:00
Christopher Lee
2192f65523 Merge pull request #16686 from mikix/mikix/LEARNER-2893 
Fix keyboard navigation in course outline
 2017-11-29 14:05:15 -05:00
Uman Shahzad
8a361300ec Fix some mako-missing-default xsslint issues in test files. 2017-11-29 23:50:31 +05:00
sandroroux
f2a1d8a78c Renamed the section that contains the diagram. Deleted description 2017-11-29 12:39:58 -05:00
sandroroux
873f86e5f3 Paired the system diagram with a quick description. 2017-11-29 12:35:15 -05:00
Uman Shahzad
37844fd927 Merge pull request #15947 from open-craft/allow-theme-template-block-override 
Allow theme template block override
 2017-11-29 22:25:27 +05:00
sandroroux
859958f059 Fixed some rendering issues. 2017-11-29 11:51:10 -05:00
Brian Mesick
167b28302c Merge pull request #16704 from edx/revert-15511-proversity/add-recover-password-endpoint 
Revert "Add recover password endpoint"
 2017-11-29 11:49:15 -05:00
sandroroux
fb100796d3 Included system diagram in README. 2017-11-29 11:47:08 -05:00
Sofiya Semenova
2fca453fcd Merge pull request #16656 from edx/sofiya/notifications-followup 
Follow-up to email template for forum notifications after testing in stage
 2017-11-29 11:01:13 -05:00
Douglas Hall
88195d4772 Merge pull request #16457 from edx/uman/degreed 
[ENT-676] Degreed Integration
 2017-11-29 10:59:43 -05:00
Diana Huang
c75191482e Merge pull request #16520 from edx/diana/logistration-updates 
LEARNER-2813: Hide optional fields.
 2017-11-29 10:43:21 -05:00
Alex Dusenbery
1602a0e66c EDUCATOR-1817 | Add traceback info on course import/export exceptions. 2017-11-29 10:10:58 -05:00
Diana Huang
8693f2fd38 UX updates to registration form. 
- hide optional fields by default.
- instructions only shown when focused in.
- removed header
- Terms of service link and checkbox on same line.
 2017-11-29 09:46:54 -05:00
Brian Beggs
845e64cd78 Revert "Add recover password endpoint" 2017-11-29 09:44:10 -05:00
Alessandro Roux
96f3545136 Merge pull request #16698 from edx/pacing/making-highlights-enable-text-consistent 
Highlights: changes the feature name to Weekly Highlight Emails in UI
 2017-11-29 09:21:30 -05:00
Uman Shahzad
59a8db9bbc Add the Degreed app and version bump for Degreed. 2017-11-29 18:13:19 +05:00
M. Rehan
b17cd9b992 Merge pull request #16536 from edx/enable-videos-upload-by-default 
Enable Video Uploads by default
 2017-11-29 17:35:01 +05:00
Albert (AJ) St. Aubin
8bd9c14f0b Merge pull request #16660 from edx/aj/entitlement_api_permissions 
Updated the permissions to all non staff users to get their entitlements
 2017-11-29 07:28:33 -05:00
Uman Shahzad
53fea6a4b7 Merge pull request #16624 from open-craft/uman/force-sync-learner-data 
[ENT-759] Add a TPA pipeline step to take forced sync into account.
 2017-11-29 17:11:29 +05:00
Uman Shahzad
ee09c4ccf9 Add a TPA pipeline step to allow force sync of user details. 
The feature is controlled by a switch on the provider.
Emails are sent if the email changes during the sync.
We skip syncing the username/email if there would be a conflict.
 2017-11-29 16:16:55 +05:00
Douglas Hall
3cd9069aa9 Merge pull request #16700 from open-craft/mtyaka/ENT-764 
Bump edx-enterprise to 0.54.1.
 2017-11-29 05:30:07 -05:00
Noraiz Anwar
ed6aca5578 Merge pull request #16622 from edx/noraiz/EDUCATOR-1774 
Remove mustache from monitoring
 2017-11-29 13:48:42 +05:00
noraiz-anwar
50e0fe83c2 update mustache.js to 2.2.1 2017-11-29 12:39:59 +05:00
Matjaz Gregoric
e38be0bb50 Bump edx-enterprise to 0.54.1. 2017-11-29 08:37:33 +01:00
Qubad786
dc335a2215 EDUCATOR-1628 
Enable Video Uploads by default with course rollout flag.
 2017-11-29 12:27:20 +05:00
Tasawer Nawaz
3431bb7933 Merge pull request #16675 from edx/tasawer/learner-3288/support-form-design-update 
Update single support form
 2017-11-29 11:56:14 +05:00
Tasawer Nawaz
8a78daa8c8 update design of support form + form will be shown only to logged in users 
LEARNER-3288
 2017-11-29 10:20:01 +05:00
Cliff Dyer
05673e7eec Merge pull request #16355 from open-craft/cliff/score-completion-preconditions 
Skip completion of non-default scorable blocks.
 2017-11-28 19:58:05 -05:00
J. Cliff Dyer
f76a099e2d Skip completion of non-default scorable blocks. 
If a scorable block either has a custom completion strategy, or is
marked as excluded from completion, don't record a completion when its
score is updated.
 2017-11-28 18:04:28 -05:00
Cliff Dyer
c1e878fb77 Merge pull request #16234 from open-craft/cliff/complete-default-blocks 
Complete default blocks
 2017-11-28 17:59:56 -05:00
Brittney Exline
390beb7000 Merge pull request #16696 from edx/bexline/enterprise_version_bump 
ENT-742 Upgrade edx-enterprise to include new enrollment api endpoint
 2017-11-28 16:31:19 -05:00
sandroroux
3d616d7802 Changed references to Weekly Highlights Emails in UI elements. 'Learn More' link in studio opens in new tab. 2017-11-28 15:49:14 -05:00
Sofiya Semenova
1ef5cf9f7a Preformatted styling for post content 2017-11-28 15:19:17 -05:00
J. Cliff Dyer
b8202e40de Handle default complete-by-viewing completion method. 
* Vertical marks blocks completed when viewed.
* Functionality is hidden behind a waffle switch
* Submissions from front-end are limited to known-incomplete blocks
* Upgrades xblock to version 1.1.1
* Related future requirements listed in TODO tagged with EDUCATOR-1778
  and relevant opencraft OC-* ticket IDs.

OC-3088
 2017-11-28 15:07:06 -05:00
Brittney Exline
ad7ca68d9c ENT-742 Upgrade edx-enterprise to include new enrollment api endpoint 2017-11-28 14:44:36 -05:00
Calen Pennington
64dd633fc9 Merge pull request #15846 from edx/ormsbee/decaffeinate_tests_2 
WIP: Decaffeinate Test Files (Part 2)
 2017-11-28 13:34:26 -05:00
Sven Marnach
6635deec62 Merge pull request #16629 from open-craft/smarnach/okta-sso 
Small fixes to support Okta SSO.
 2017-11-28 19:31:13 +01:00