Commit Graph

58450 Commits

Author SHA1 Message Date
edX Transifex Bot
babd15259e fix(i18n): update translations 2020-02-23 16:33:36 -05:00
Jillian Vogel
64c1a4fed4 Merge branch 'master' into jill/log-heartbeat-failures 2020-02-22 21:36:07 +10:30
Luis Moreno
73c6a90bb3 Do not hide all the elements of the units with problems to anonymous users:
Right now the units of a public course are hidden if there is at least a graded activity in them. This is done due to a change(69eeca61d8) that was done before the implementation of public_view mechanism for unenrolled users.

Since we use public_view now and by default it restricts the unit rendering for anonymous users we do not need to limit the access at this way for anonymous users.
2020-02-21 21:00:55 -04:00
Diana Huang
31e011c2ea Merge pull request #23154 from edx/diana/move-trusted-applications
Use DOT for creating new sites instead of DOP.
2020-02-21 16:06:12 -05:00
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
Dillon Dumesnil
5ea4d8f503 Merge pull request #23147 from edx/ddumesnil/create-calendar-model-AA-34
AA-34: Add UserCalendar Model
2020-02-21 15:01:10 -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
edX cache uploader bot
31ca3769a3 Updating Bokchoy testing database cache (#23162) 2020-02-21 13:57:44 -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
David Joy
b7a000b92f Removing MFE redirect from courseware page.
We decided this approach - of redirecting to the new courseware MFE when users hit the page - won’t be feasible because there are still circumstances when we want that page to load.  For instance, exams, or if an instructor wants to go back to the old experience.  Instead of doing this, we need to track down all the links to the courseware page and put the waffle flag check on those instead.
2020-02-21 11:58:48 -05:00
Calen Pennington
645c70a140 Allow due-dates for self-paced courses in the course outline 2020-02-21 11:58:17 -05:00
David Joy
fe1942561a Redirect to the courseware MFE when the ‘courseware’ view is loaded 2020-02-21 11:44:38 -05:00
David Joy
d96ff272e2 feat: waffle flag for redirecting to courseware MFE
1. This is a partial check-in.  It causes jump_to links in the header user menu to work, but doesn’t address any other dashboard links.
2. I also need to figure out the best way to test this, having not tested a toggle like this before.
2020-02-21 11:44:38 -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
atesker
629b772172 EDUCATOR-4916 - additional error handling 2020-02-21 11:33:23 -05:00
Dave St.Germain
9f8317665b Merge pull request #23048 from edx/dcs/mfe-switcher
Add button to switch to courseware MFE
2020-02-21 11:31:54 -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
dca3dbc5ed Merge pull request #23008 from cpennington/self-paced-relative-dates
Self paced relative dates
2020-02-21 11:14:06 -05:00
David Ormsbee
0d3d6802a2 Merge pull request #21616 from open-craft/samuel/gate-change-password
SE-1496 conditionally re-enable user change password form in admin
2020-02-21 11:03:06 -05:00
Calen Pennington
b47eb0f24c Extract common configuration/documentation into the base StackedConfigModelAdmin class 2020-02-21 10:50:22 -05:00
Calen Pennington
98328ea426 On publish, add evenly spaced dates to self-paced courses 2020-02-21 10:50:22 -05:00
edx-transifex-bot
67c79e27b4 fix(i18n): update translations (#23155) 2020-02-21 15:26:21 +05:00
Samuel Walladge
39de23c666 Add flag to enable password change form in admin
This was previously disabled because changing another user's password is
both not usually recommended and bypasses password policy. Here, we add
a feature flag (`ENABLE_CHANGE_USER_PASSWORD_ADMIN`) to allow
re-enabling this password change form. This allows continued use of this
functionality by clients that require it.
2020-02-21 11:22:10 +10:30
Simon Chen
b7075625b2 PROD-1045 Update the edx-proctoring library to version 2.2.7 for Email Message update. We want to update the message so we can support our course team better 2020-02-20 14:33:33 -05:00
edX cache uploader bot
7dadb5b98a Updating Bokchoy testing database cache (#23150) 2020-02-20 14:01:10 -05:00
edX requirements bot
2bc735a91c Updating Python Requirements (#23149) 2020-02-20 13:48:08 -05:00
Dave St.Germain
00f5beb66f Merge pull request #22992 from edx/dcs/perf-vertical
Improve Vertical Performance
2020-02-20 12:30:22 -05:00
Dave St.Germain
a5b0f71108 Several optimizations for improving vertical rendering performance. 2020-02-20 11:41:21 -05:00
Thomas Tracy
80320ab7a0 Add phone_number field to UserProfile model (#23132)
Adds a simple nullable field to the UserProfile model. The only
validation done it to make sure any character saved in that field is a
digit and not a letter. We do not distiguish on a model level if the
phone number is international or not.
2020-02-20 10:52:46 -05:00
Ben Holt
e1e0258554 Print experiment in output so incorrect usage like passing just a username instead of experiment name is easier to recognize (#23043) 2020-02-20 10:49:56 -05:00
Nathan Sprenkle
08269e8367 Before adding user to a team, check the organization protection status (#23134)
* Check learner enrollment status to avoid mixing learners from incompatible tracks (e.g. masters/audit) to the same team
* When a new team is encountered on a team management CSV, create it with the protection status of the user
2020-02-20 10:08:41 -05:00
Mike OConnell
5ec786831b Merge pull request #23114 from edx/ENT-2607-2
Don't update account recovery until after activation
2020-02-20 09:03:59 -05:00
Alex Dusenbery
596eee7085 Upgrade ORA to 2.6.12 | When fetching file URLs from keys stored in Submission records, don't break just because we encountered one missing file; there might be more, existing files after it. 2020-02-20 09:02:19 -05:00
Uzair Rasheed
f8bd5304b6 Merge pull request #23136 from edx/PROD-159/add-five-seconds-step-to-video-slider
Add five seconds step to video slider
2020-02-20 18:56:40 +05:00
Diana Huang
eaeed53b6f Merge pull request #23142 from edx/coryleeio/setting_profile_image_secret_key
This key used to have underscores and was accidentally changed to not have underscores, setting it back to the old value
2020-02-19 15:25:41 -05:00
Manjinder Singh
c540eb14ee Removing deprecated rest_framework_oauth library (#23139)
* Removing deprecated rest_framework_oauth library

* removing dependecy of django-rest-framework-oauth

* removing oauth_provider from cms
2020-02-19 15:10:59 -05:00
Jansen Kantor
9b6eb668f4 bump ora (#23140) 2020-02-19 14:25:36 -05:00
Mike O'Connell
bc99a31738 Merge branch 'master' into ENT-2607-2 2020-02-19 14:01:28 -05:00
Mike O'Connell
2c5264cb94 Unit test for account recovery
Add a unit test to create and activate a recovery email address

ENT-2607
2020-02-19 14:00:07 -05:00
Diana Huang
2f019c4d23 Rename profile image hash seed to better describe what it is. 2020-02-19 13:11:45 -05:00
Troy Sankey
18deacde54 Revert "Revert "This stage does the following: (#22692)""
This reverts commit 84de6bc6de
which reverts commit cebeab4348
which implements the first stage of the `values` column rename in
SiteConfiguration.  However, I included a small change:

This time, we set a default value on the new `site_values` column so
that the ORM will happily deserialize the JSONField without throwing a
JSONDecodeError.
2020-02-19 12:01:57 -05:00
Dave St.Germain
5e6d3a0411 Merge pull request #22973 from eduNEXT/lmm/gradebook_full_name
Display profile name in gradebook api
2020-02-19 11:53:39 -05:00
Dave St.Germain
592b34b998 Merge pull request #21158 from eduNEXT/lmm/add_currency_choose_template
Setting template to show currency defined in the course mode DB record
2020-02-19 11:46:49 -05:00
Cory Lee
5b6feccffd This key used to have underscores and was accidentally changed to not have underscores, setting it back to the old value 2020-02-19 11:32:37 -05:00
Diana Huang
615068311f Merge pull request #23097 from edx/diana/remove-class-dashboard
Remove class_dashboard.
2020-02-19 10:57:12 -05:00
edX requirements bot
448b6a0d66 Updating Python Requirements (#23137) 2020-02-19 09:46:21 -05:00
Bill DeRusha
92cfa81473 Merge pull request #23138 from edx/revert-23127-msingh/remove_oauth
Revert "Removing deprecated rest_framework_oauth library"
2020-02-19 09:00:55 -05:00