Commit Graph

4359 Commits

Author SHA1 Message Date
Feanil Patel
54d7743817 Don't iterate over an empty filters list. 2020-02-27 16:32:43 -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
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
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
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
pkulkark
b31ca38fbd Adds weeks argument to send_course_update management command. 2020-02-25 20:53:41 +05:30
Mike OConnell
e04a10f62c Merge pull request #23184 from edx/moco/ENT-1913
Add existence check on secondary email
2020-02-25 06:59:38 -05:00
Diana Huang
0b9f7298c6 Replace DOP library factories with the DOT equivalent.
https://openedx.atlassian.net/browse/BOM-1312
2020-02-24 16:33:56 -05:00
Mike O'Connell
c242ed6aca Add existence check on secondary email
Moves the existence check for secondary (recovery) email to validate
method. If the email already exists, silently remove it from the set of
data to be updated. This parallels the existing behavior for updating
the primary email.

ENT-1913
2020-02-24 13:03:09 -05:00
Calen Pennington
f3bce46757 Allow due-dates for self-paced courses in the course outline 2020-02-24 12:43:09 -05:00
Calen Pennington
8d25274cec Revert "Allow due-dates for self-paced courses in the course outline" 2020-02-24 10:18:08 -05:00
Calen Pennington
bfb374c941 Merge pull request #23161 from cpennington/show-due-dates-self-paced
Allow due-dates for self-paced courses in the course outline
2020-02-24 09:36:49 -05:00
Dillon Dumesnil
243c4cbff2 Merge pull request #23153 from edx/ddumesnil/subscribe-to-calendar-AA-35
AA-35: Adds functions to subscribe and unsubscribe from a calendar sync
2020-02-24 08:19:31 -05:00
Jillian Vogel
64c1a4fed4 Merge branch 'master' into jill/log-heartbeat-failures 2020-02-22 21:36:07 +10:30
Diana Huang
0462e8fc5d Use DOT for creating new sites instead of DOP. 2020-02-21 15:13:04 -05:00
Dillon Dumesnil
eab8001ad3 AA-35: Adds functions to subscribe and unsubscribe from a calendar sync 2020-02-21 15:04:01 -05:00
Braden MacDonald
23d649d7e3 REST API to export modulestore XBlocks as OLX.
This was originally a separate plugin called openedx-olx-rest-api.

It provides a Studio API that any user with course authoring permission can use to get the OLX of an individual XBlock or a unit. Without this, the only way to get an XBlock's OLX was to download the tarball of the entire course.

Examples of usage (be logged in to Studio on devstack):

Simple HTML XBlock:
http://localhost:18010/api/olx-export/v1/xblock/block-v1:edX+DemoX+Demo_Course+type@html+block@030e35c4756a4ddc8d40b95fbbfff4d4/

Exporting a unit:
http://localhost:18010/api/olx-export/v1/xblock/block-v1:edX+DemoX+Demo_Course+type@vertical+block@134df56c516a4a0dbb24dd5facef746e/

Example output for an HTML block:

    { 
       "root_block_id":"block-v1:edX+DemoX+Demo_Course+type@html+block@030e35c4756a4ddc8d40b95fbbfff4d4",
       "blocks":{ 
          "block-v1:edX+DemoX+Demo_Course+type@html+block@030e35c4756a4ddc8d40b95fbbfff4d4":{ 
             "olx":"<html display_name=\"Blank HTML Page\"><![CDATA[\n<p><strong>Welcome to the edX Demo Course Introduction.</strong></p>\n]]></html>\n"
          }
       }
    }

The code is designed primarily for use when importing content into Blockstore. So it will:
* Export HTML blocks as a combined OLX/HTML file, with the HTML in a CDATA section
* Convert vertical blocks to unit blocks (unit is like a vertical but has no UI elements)
* Detect static files (such as images) used by the XBlock and list the absolute URL of each static file in the "static_files": {...} JSON element for each XBlock that has at least one static file usage. This can handle static files that are in mongo ("contentstore" / "Files & Uploads") as well as files generated on-the-fly during OLX serialization via the export_fs API (mostly this is video transcripts).
2020-02-21 11:29:21 -08:00
Dillon Dumesnil
bb1981de6c AA-34: Add UserCalendarSyncConfig Model 2020-02-21 14:21:20 -05:00
Dillon Dumesnil
e738d046da Merge pull request #23141 from edx/ddumesnil/create-calendar-event-id-AA-33
AA-33: Function to uniquely create calendar event id for user and assignment
2020-02-21 13:13:28 -05:00
Calen Pennington
645c70a140 Allow due-dates for self-paced courses in the course outline 2020-02-21 11:58:17 -05:00
Troy Sankey
3f85ba3fe6 Merge pull request #23144 from edx/pwnage101/rename_site_configuration_siteconfiguration_values_1.1
Rename values in SiteConfiguration/History (1/3) (retry)
2020-02-21 11:42:15 -05:00
Dillon Dumesnil
57dbb2d47c AA-33: Function to create calendar event id
The function will create a unique event id using a user and assignment
2020-02-21 11:41:16 -05:00
Robert Raposa
372d2e927c BOM-1264: add third-party-auth scope and usage (#23135)
* WIP: add third-party-auth scope and usage

BOM-1264


* Fix tests now that we do permissions in a more standard way.

Rather than manually setting the permission class we previously
explicitly raised a PermissionDenied exception.  The way DRF
permissoning logic works, if we use the WWW-Authenticate header in the
highest priority auth class, it will return a 401 instead of a 403.


* Added test to make sure having permissions gives access to user mapping api

* Test new filters logic.

Ensure that the filters we add to the application access model make it
into the JWT correctly.

* quality fix

* quality fix

* disable pylint warning

* quality fix

* fix indent prob

Co-authored-by: Feanil Patel <feanil@edx.org>
Co-authored-by: Manjinder Singh <49171515+jinder1s@users.noreply.github.com>
2020-02-21 11:25:28 -05:00
Calen Pennington
b47eb0f24c Extract common configuration/documentation into the base StackedConfigModelAdmin class 2020-02-21 10:50:22 -05:00