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

46639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zubair Afzal
d5df04fca4 Merge pull request #18470 from edx/zub/ENT-1052-discount-by-enterprise-catalog 
ENT-1052 discount by enterprise catalog
 2018-06-29 17:03:22 +05:00
zubair-arbi
bbdcf6de7a ENT-1052 discount by enterprise catalog 2018-06-29 16:04:06 +05:00
Nimisha Asthagiri
a95a2b91b7 Merge pull request #18458 from edx/arch/oauth-scopes-apis 
Enable Grades and Certificates APIs to enforce OAuth Scopes
 2018-06-28 20:27:28 -04:00
Nimisha Asthagiri
ce4cb53672 Update Permissions to use latest edx-drf-extensions and rest_condition 2018-06-28 18:37:53 -04:00
Nimisha Asthagiri
522349c502 Upgrade edx-drf-extensions and add rest_condition 2018-06-28 18:37:52 -04:00
Nimisha Asthagiri
b203e8a13b Enable OAuth Scopes for Grades API 2018-06-28 18:37:52 -04:00
Nimisha Asthagiri
3a45bab57c Enable OAuth Scopes for Certificates API 2018-06-28 18:37:52 -04:00
Douglas Hall
7083797c54 Merge pull request #18487 from edx/douglashall/override_default_jwt_issuer 
Override DEFAULT_JWT_ISSUER and RESTRICTED_APPLICATION_JWT_ISSUER settings.
 2018-06-28 17:14:13 -04:00
Douglas Hall
195676d539 Override DEFAULT_JWT_ISSUER and RESTRICTED_APPLICATION_JWT_ISSUER settings. 2018-06-28 17:10:18 -04:00
Calen Pennington
b85d6f031c Merge pull request #18417 from cpennington/cale/fix-ora-webpack 
Cale/fix ora webpack
 2018-06-28 12:47:53 -04:00
Douglas Hall
2a77710e10 Merge pull request #18429 from edx/douglashall/oauth_scopes_part2 
ARCH-116 OAuth2 Scopes Implementation
 2018-06-28 11:17:17 -04:00
Michael Roytman
41f6bbbb97 Merge pull request #18466 from edx/mroytman/EDUCATOR-3026-add-links-to-course-checklist 
pass relevant links to studio-frontend checklist
 2018-06-28 10:37:08 -04:00
Douglas Hall
db22939193 Add OAuth2 Scopes and Filters to JWTs. 2018-06-28 10:30:09 -04:00
Qubad786
c444a51af8 Resolve transcript migrations issues resulted from running it on stage 2018-06-28 18:47:40 +05:00
Awais Jibran
b820c0c6f9 Merge pull request #18471 from edx/aj/fix-correct-map-problem 
Do not update correct_map if state is invalid (EDUCATOR-3016)
 2018-06-28 13:42:31 +05:00
Mushtaq Ali
c2c2a77c04 Merge pull request #18472 from edx/mushtaq/update-enterprise-version 
Enterprise version bump to 0.70.1
 2018-06-28 12:55:16 +05:00
Mushtaq Ali
dc698608d2 Enterprise version bump to 0.70.1 2018-06-28 12:07:57 +05:00
Ned Batchelder
8631b23a86 Merge pull request #18444 from edx/nedbat/restore-context-help 
Use context help in the LMS for Open edX
 2018-06-27 22:35:07 -04:00
Calen Pennington
df67288a3b Use the tinymce from vendor without modification 2018-06-27 22:27:07 -04:00
Calen Pennington
07a15c681f Reapply the XBlock RequireJS -> Webpack changes 
This reverts commit 105db2cf59, reversing
changes made to 447457594f.
 2018-06-27 22:27:07 -04:00
Michael Terry
a9c7e55bb8 Add notify_credentials mgmt command 
This command will trigger old data about certificates or grades to
be sent to the Credentials service, for initial population or if
something goes wrong and we need to cover a downtime gap.

LEARNER-5378
 2018-06-27 14:45:26 -04:00
Jeremy Bowman
14a438672d Merge pull request #18464 from edx/jmbowman/TE-2584 
TE-2584 Upgrade XBlock to fix edx-sga warning
 2018-06-27 11:55:41 -04:00
Brian Mesick
9027b517e0 Merge pull request #18423 from edx/bmedx/retirement_endpoint_refactor 
Refactor retirement endpoints to isolate Sailthru and respect boundaries
 2018-06-27 11:53:45 -04:00
bmedx
f3a9e508a0 Refactor retirement endpoints to isolate Sailthru and respect boundaries 
- Change retire mailings endpoint to use new USER_RETIRE_THIRD_PARTY_MAILINGS signal, currently only used by Sailthru retirement
- Move USER_RETIRE_MAILINGS signal firing to the LMS misc endpoint
- Remove duplicate clearing of UserOrgTags
- Remove LMS imports in openedx/core and update usage to use new USER_RETIRE_LMS_CRITICAL and USER_RETIRE_LMS_MISC signals
- Add testing for new signal handlers and app registration for the LMS survey app
 2018-06-27 10:23:49 -04:00
Jeremy Bowman
e80152fd8a TE-2584 Upgrade XBlock to fix edx-sga warning 2018-06-27 10:16:51 -04:00
Awais Jibran
a8d6443df3 Do not update correctmap if state is invaid. 2018-06-27 17:54:39 +05:00
Brittney Exline
a590d89fac Merge pull request #18467 from edx/bexline/enterprise_version_bump 
ENT-1007 Upgrade edx-enterprise to 0.70.0
 2018-06-26 15:07:33 -06:00
Brittney Exline
3d30a44241 ENT-1007 Upgrade edx-enterprise to 0.70.0 2018-06-26 16:26:46 -04:00
Michael Roytman
d6a3ce9b67 pass relevant links to studio-frontend checklist 2018-06-26 15:34:25 -04:00
Jeremy Bowman
9375bda9ec Merge pull request #18461 from eduNEXT/dqe/Try-out-python-modernize 
Add python-modernize INCR-3
 2018-06-26 10:57:46 -04:00
Feanil Patel
4e76a5d025 Merge pull request #18462 from edx/feanil/remove_beacon 
Get rid of all code related to the CDN Experiments.
 2018-06-26 10:47:38 -04:00
Rabia Iftikhar
2a44523893 Merge pull request #18437 from edx/ri/EDUCATOR-3055-null-enrollment-dates-coursererun 
EDUCATOR-3055 clear the enrollment dates for the rerun of the course
 2018-06-26 18:49:08 +05:00
rabiaiftikhar
c6ce34314c EDUCATOR-3055 clear the enrollment date fields for the rerun of the course 2018-06-26 15:27:02 +05:00
Squirrel18
4f12be0894 Files changed by modernize and new gitignore type file. 2018-06-25 17:27:51 -05:00
Feanil Patel
cd47b28339 Get rid of all code related to the CDN Experiments. 
These were very early experiments by the old performance team
on using CDNs for videos and logging performance data.  No one
is looking at this data and it's just extra cruft on every page.
 2018-06-25 18:03:33 -04:00
Squirrel18
48e6ce6336 add python-modernize to development dependencies file. 2018-06-25 16:56:13 -05:00
Michael Roytman
7748a0fbd4 Merge pull request #18460 from edx/mroytman/fix-missing-checklist-stylesheets 
add missing stylesheets from studio-frontend
 2018-06-25 17:38:22 -04:00
Michael Roytman
c25faeb660 add missing stylesheets from studio-frontend 2018-06-25 16:50:26 -04:00
Matt Tuchfarber
aab971ed7e Merge pull request #18419 from edx/tuchfarber/fix_program_course_order 
Change program's course runs to be oldest with open enrollment
 2018-06-25 15:37:04 -04:00
Michael Roytman
a439d5164c Merge pull request #18459 from edx/mroytman/bump-studio-frontend-to-1.11.1 
bump studio-frontend package version to 1.11.1
 2018-06-25 15:29:59 -04:00
Michael Roytman
cf3adc1267 bump studio-frontend package version to 1.11.1 2018-06-25 14:47:19 -04:00
Stu Young
2803c0b37b Merge pull request #18457 from edx/testeng/bokchoy_auto_cache_update_54f8d4e7d2b218fec97f75271d5712b3ece9ab3c 
Bokchoy db cache update
 2018-06-25 14:07:03 -04:00
edx-cache-uploader-bot
11eeb19cb0 Updating migrations 2018-06-25 13:36:08 -04:00
Noraiz Anwar
18f0c59f1a Merge pull request #18436 from edx/noraiz/EDUCATOR-2773 
add delay in score recalculation on enrollment update
 2018-06-25 22:06:30 +05:00
Qubad786
aa2afd8c0b Video status improvements 2018-06-25 20:43:21 +05:00
Qubad786
c7c2f808e7 Add a field to transcript migration data model to track number of runs 
include command run tracking information in logging
 2018-06-25 20:42:23 +05:00
Michael Terry
fd33130d73 Add initial grade signaling 
Tells the Credential service about user grades when a cert is awarded
or a grade for a course with an awarded cert changes.

LEARNER-5051
 2018-06-25 11:42:08 -04:00
Alessandro Roux
32649f91d5 Merge pull request #18440 from edx/roux/multiple-toolbars 
EDUCATOR-3042: Fixes bug where inline discussion's comment editor has multiple toolbars.
 2018-06-25 09:49:30 -04:00
hamzamunir7300
a5c8c9f373 Merge pull request #18411 from edx/LEARNER-5509 
Adjust default of Course Landing Experience to use expected platform …
 2018-06-25 17:24:15 +05:00
Qubad786
5b49f17dfe migrate video transcripts for both published and draft structure 2018-06-25 16:16:59 +05:00