Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5629 Commits

Author SHA1 Message Date
Awais Jibran
c6e0985812 Upgrade edx-when in edx-platform 
Run `make upgrade` on edx-platform to update python packages.
PROD-1333
 2020-03-03 20:01:09 +05:00
Braden MacDonald
af6cab86c3 Enforce permissions for content libraries, add REST API to edit perms 2020-03-02 18:17:46 -08:00
Dave St.Germain
c1a09ffcbb Merge pull request #23238 from edx/dcs/mode-info 
Add verified mode to the courseware API
 2020-03-02 18:16:12 -05:00
Cory Lee
4be35d9eca DENG-17 Dropping FK on schedules to enrollments to perform ghost migration (#23260) 2020-03-02 16:32:04 -05:00
Albert (AJ) St. Aubin
0721357e46 Create MB External ID on creation of a CourseEntitlement in MB Program 2020-03-02 13:44:20 -05:00
Troy Sankey
06b547057e Add migration to populate site_values in SiteConfigurationHistory 
Right now the ORM is very unhappy about the JSONField `site_values`
in SiteConfigurationHistory containing non-JSON (empty strings).  We
cannot even write a data migration using the ORM to populate the field
because that causes a JSONDeserializationError.  Therefore, we must
bypass the ORM and populate the values with raw SQL.

DENG-18
 2020-03-02 11:44:28 -05:00
Cory Lee
2c87aeddc3 DENG-17 Dropping the FK on schedulesexperience->schedule to apply change to schedule as a gh-ost migration (#23242) 2020-03-02 10:10:52 -05:00
Feanil Patel
5ec487452d Merge pull request #23188 from edx/robrap/BOM-1324-add-constraint 
BOM-1324: remove oauth2.enforce_jwt_scopes toggle
 2020-03-02 09:55:35 -05:00
Manjinder Singh
d08cd9ce04 Removing provider imports from edx-platform (#23229) 
* Removing from provider imports from openedx

 * removed all uses of retire_dop_oauth2_models

* Removing provider library from lms, common, and cms

Created/copied function short_token(from django-oauth-provider) and create_hash256 to help with conversion
 2020-03-02 08:56:54 -05:00
Bill DeRusha
c1ebdaf0c3 Fix Deprecation: log.warn -> log.warning 2020-02-28 15:04:07 -05:00
Dave St.Germain
84e854d22c Merge pull request #23205 from edx/dcs/fix-tabs 
Add url_slug to the CourseOverviewTab, to support serializing StaticTabs
 2020-02-28 12:43:36 -05:00
Dave St.Germain
7d94408132 Add verified mode to the courseware API 2020-02-28 12:42:26 -05:00
Frank Bijlsma
a195b5699c expand subsections when the url anchor points to them. 2020-02-28 11:32:13 -03:00
Feanil Patel
54d7743817 Don't iterate over an empty filters list. 2020-02-27 16:32:43 -05:00
Feanil Patel
781629d489 Correct docs and test of restricted JWTs. 
The comment is misleading beacuse now that restricted JWTs are enforced
everywhere, we don't need to set the expiry to be in the past for JWT
tokens.
 2020-02-27 15:53:48 -05:00
Calen Pennington
5cce110a91 Merge pull request #23217 from cpennington/edx-when-published-only 
Only extract published dates into edx-when
 2020-02-27 15:12:51 -05:00
Calen Pennington
5ea77433d3 Only extract published dates into edx-when 2020-02-27 14:10:12 -05:00
Troy Sankey
ac4fd6f91a Merge pull request #23224 from edx/revert-23214-pwnage101/rename_site_configuration_siteconfiguration_values_2.1 
Revert "Rename values in SiteConfiguration (2/3) attempt #2"
 2020-02-27 13:58:53 -05:00
Calen Pennington
6d2ad6aa2f Merge pull request #23219 from cpennington/fix-emails-no-weeks 
Don't try and multiply None with a number when computing number of we…
 2020-02-27 13:31:36 -05:00
Troy Sankey
e6f58b6d4c Revert "Rename values in SiteConfiguration (2/3) attempt #2" 2020-02-27 13:24:55 -05:00
Calen Pennington
70314cfa7b Don't try and multiply None with a number when computing number of weekly emails to send 2020-02-27 11:47:28 -05:00
jinder1s
295da79fe5 Remove DOP dispatching from oauth_dispatch. 
https://openedx.atlassian.net/browse/BOM-1330
 2020-02-27 10:47:06 -05:00
Feanil Patel
fe22e77072 Merge pull request #23199 from edx/robrap/BOM-1292-remove-application-organization 
BOM-1292: remove uses of ApplicationOrganization
 2020-02-27 10:36:46 -05:00
Troy Sankey
3fdd08b683 Merge pull request #23214 from edx/pwnage101/rename_site_configuration_siteconfiguration_values_2.1 
Rename values in SiteConfiguration (2/3) attempt #2
 2020-02-27 10:34:37 -05:00
Robert Raposa
e2cc7fa348 fix failing tests 2020-02-27 09:00:01 -05:00
Robert Raposa
a4716c75cb fix tests 2020-02-27 08:58:45 -05:00
Robert Raposa
84686e81c3 BOM-1324: remove oauth2.enforce_jwt_scopes toggle 
The oauth2.enforce_jwt_scopes waffle switch was added temporarily for
the rollout of jwt scopes. This removes the toggle and replacing code
with the equivalent of `oauth2.enforce_jwt_scopes` as True.
 2020-02-27 08:58:45 -05:00
Feanil Patel
4a54967cc5 Replace the ApplicationOrganization in EdxOAuth2AuthorizationView 
Move to using the filters list provided in the ApplicationAccess model
to genarically store scopes instead of the org specific ApplicationOrg
model mapping.
 2020-02-26 16:02:39 -05:00
Matt Tuchfarber
7cd9cb4381 Merge pull request #23212 from edx/tuchfarber/MICROBA-195 
Add phone number to account API
 2020-02-26 15:31:39 -05:00
Matt Tuchfarber
82024fbf77 Add phone number to account API 
This is so it's user editable in the Account MFE.
 2020-02-26 15:06:38 -05:00
Troy Sankey
3400326e50 Fix migration issue with the missing method. 
This commit fixes an issue originally in 3541643d where an instance
method on a model was missing in a migration.  The problem was that
Django is smarter than we thought, and is somehow able to construct an
older version of the model before the commit, where there was no such
method.  The solution is just to pull the method out of the model.

DENG-18
 2020-02-26 14:44:14 -05:00
Albert (AJ) St. Aubin
fce217b0dc Merge pull request #23148 from edx/aj/MICROBA-150 
MICROBA-150 Creating EnternalIds for users enrolling in MB Programs
 2020-02-26 14:07:19 -05:00
Albert (AJ) St. Aubin
b1bbfc7065 Creating EnternalIds for users enrolling in MB Programs 2020-02-26 13:35:31 -05:00
Troy Sankey
c422dec083 Revert "Revert "Rename values in SiteConfiguration (2/3)"" 
This reverts commit b85aa4b3fb.
 2020-02-26 12:54:24 -05:00
Feanil Patel
667df875bd Add back necessary import for ApplicationOrganization. 2020-02-26 11:30:59 -05:00
Feanil Patel
b6104b71fa Deal with linting violations. 2020-02-26 11:29:55 -05:00
Troy Sankey
b85aa4b3fb Revert "Rename values in SiteConfiguration (2/3)" 2020-02-26 11:23:56 -05:00
Dave St.Germain
8bedb4283d Add url_slug to the CourseOverviewTab, to support serializing StaticTabs. 2020-02-26 10:56:36 -05:00
Troy Sankey
1307946d05 Merge pull request #22851 from edx/juliasq/rename_site_configuration_siteconfiguration_values_2 
Rename values in SiteConfiguration (2/3)
 2020-02-26 10:26:22 -05:00
Manjinder Singh
e9e584b28b Removing DOP from auth_exchange (#23187) 
-  This PR removes all imports from provider by either bringing them into edx-platform or finding dot replacement. Removing tests that tested dop parts of code. 

-  Skipping some tests and removing dop

The tests are difficult to fix due to its entanglement with dop use in third_party_auth.
These tests should be restarted once dop has been removed from third_party_auth and its tests.

-  set ENABLE_DOP_ADAPTER = False for devstack
 2020-02-26 10:21:26 -05:00
HammadAhmadWaqas
b99977a3cb added management command to push old enrollments to ecommerce 2020-02-26 17:41:05 +05:00
Tim McCormack
95d4acad7c Minimize dependency on django-celery (#23193) 
- Reimplement `djcelery.common.respect_language` utility function so we
  can drop the dependency.
- Loosen `celery` pinning to a range, which brings in a fix for a
  possible crash bug

Also, pin `path` to 13.1.0 for now in order to continue supporting py35.
 2020-02-26 00:46:36 +00:00
Ned Batchelder
2eeae3b9ad Merge pull request #22164 from open-craft/jill/log-heartbeat-failures 
SE-1773 Logs failed heartbeat checks
 2020-02-25 16:00:52 -05:00
Robert Raposa
3526f48c2a remove uses of ApplicationOrganization 
To understand ApplicationOrganization is being removed, see:
- 372d2e927c/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0011-scope-filter-support.rst (L19)

See ApplicationOrganization docstring for instructions to community
for migrating data post-Juniper.

BOM-1292
 2020-02-25 15:55:07 -05:00
David Ormsbee
8c7dc22dfe Merge pull request #23068 from open-craft/olx-rest-api 
REST API to export modulestore XBlocks as OLX
 2020-02-25 15:11:08 -05:00
Julia Eskew
3541643dd5 Rename values in SiteConfiguration (2/3) 
This stage does the following:

- Includes a data migration to copy the values from old to new field.
- Changes business logic to switch to using new field.
- Deletes all code references of the old field.
 2020-02-25 13:54:02 -05:00
Diana Huang
d5ae5c3a8e Remove wrapper code from logout flow. 2020-02-25 13:06:42 -05:00
Diana Huang
1212ab756a Merge pull request #23186 from edx/diana/replace-access-token-factory 
Replace DOP library factories with the DOT equivalent.
 2020-02-25 12:35:05 -05:00
Jeff LaJoie
d93ef18907 Merge pull request #22990 from edx/jlajoie/AA-6 
AA-6: Adds in Dates tab for Course Overview
 2020-02-25 11:13:05 -05:00
Jeff LaJoie
fa3b1cd835 AA-6: Adds in dates tab and dates dashboard view to courseware 2020-02-25 10:48:45 -05:00