Commit Graph

53333 Commits

Author SHA1 Message Date
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
Diana Huang
7b3baae4d3 Merge pull request #23194 from edx/diana/remove-from-logout-flow
Remove more references to the old edx_oauth2_provider library.
2020-02-25 14:17:04 -05:00
edX requirements bot
79bcc9ede8 Updating Python Requirements (#23190) 2020-02-25 13:41:15 -05:00
Diana Huang
4fb7f9bfab Remove oauth2_handler djangoapp. 2020-02-25 13:15:08 -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
David Ormsbee
7ec58fd721 Merge pull request #19906 from open-craft/opencraft/edx-platform/devan/editable-weekly-course-highlight-emails
Allow a configurable number of weekly course highlight emails
2020-02-25 10:59:30 -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
David Joy
ce2952162e Merge pull request #23016 from edx/djoy/learning_mfe_waffle_flag
feat: waffle flag for redirecting to courseware MFE
2020-02-25 10:04:45 -05:00
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
Matt Hughes
4f70bf6138 increase timeout for proctortrack pings accommodating common crashes
JIRA:CR-1597
2020-02-24 15:01:52 -05:00
Calen Pennington
87059e7693 Merge pull request #23181 from cpennington/show-due-dates-self-paced-from-edx-when
Show due dates self paced from edx when
2020-02-24 13:59:41 -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
Robert Raposa
a3ac11cd8b Merge pull request #23182 from edx/robrap/BOM-1324-add-constraint
BOM-1324: add constraint for edx-drf-extensions
2020-02-24 13:00:02 -05:00
Calen Pennington
f3bce46757 Allow due-dates for self-paced courses in the course outline 2020-02-24 12:43:09 -05:00
Diana Huang
aa31bc9cc7 Merge pull request #23050 from edx/diana/add-to-production
Add DOP adapter setting to production.py so it can be overridden.
2020-02-24 11:16:10 -05:00
Dave St.Germain
f70ca08fef Merge pull request #23180 from edx/dcs/learning-slash
Learning MFE URL should not have a slash
2020-02-24 11:15:14 -05:00
Calen Pennington
9f8844e76d Merge pull request #23177 from edx/revert-23161-show-due-dates-self-paced
Revert "Allow due-dates for self-paced courses in the course outline"
2020-02-24 10:59:17 -05:00
Calen Pennington
46e0ecfb89 Remove a bok-choy test that shouldn't have been a bok-choy test 2020-02-24 10:50:01 -05:00
Diana Huang
0a818a3530 Add DOP adapter setting to production.py so it can be overridden. 2020-02-24 10:42:23 -05:00
Dave St.Germain
f8886239d0 Learning MFE URL should not have a slash 2020-02-24 10:40:08 -05:00
David Joy
e427fad52b Removing redirect to MFE for jump_to links.
This will ultmately be put back in as part of TNL-6982, but for now we don’t want this code to be associated with the waffle flag.
2020-02-24 10:29:53 -05:00
Robert Raposa
ce0b424254 add constraint for edx-drf-extensions
There is a planned edx-drf-extension update to 3.0.0 to remove the
toggle used for ENFORCE_JWT_SCOPES. Currently, edx-platform is dependent
on the this toggle. This constraint will keep other `make upgrade` PRs
working in the short window before the edx-paltform PR to remove the
same toggle can land.

BOM-1324
2020-02-24 10:25:57 -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
edX cache uploader bot
30e9dfad37 Updating Bokchoy testing database cache (#23164) 2020-02-24 10:15:39 -05:00
Zia Fazal
8fbe6e6fa9 Merge pull request #23169 from edx/ziafazal/ENT-2597
ENT-2597: Use encodeURIComponent instead of encodeURI
2020-02-24 19:46:06 +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
David Ormsbee
1c67d61798 Merge pull request #22385 from eduNEXT/lmm/publicaccess
Do not hide all the elements of the units with graded problems to anonymous users
2020-02-24 09:35:38 -05:00
Matt Hughes
97f65ae550 Upgrade proctoring
Impact is that for proctoring backends which support in-exam keepalive
ping messages to ensure the monitoring software is running while
learners have access to proctored exams, we will no longer send ping
requests while the learner is on the ready_to_submit page. These pings
have caused issues for some of our learners in the past, in that some
learners idle on this page waiting for a slow-to-shut-down
application. Pinging while the app is shutting down may've caused
spurious false positives for suspicious learner behavior, and we lose
little integrity by enabling the learner to continue to see the
non-exam-content interstitial, so we're relaxing this rule.

JIRA:CR-1597
2020-02-24 09:25:25 -05:00
Calen Pennington
401659a5b0 Remove a bok-choy test that shouldn't have been a bok-choy test 2020-02-24 08:58:46 -05:00
Uzair Rasheed
5e8213b820 Merge pull request #23176 from edx/PROD-1032/fix-alert-css
Fix alert css for smaller viewports
2020-02-24 18:55:12 +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
uzairr
3b0638e3b2 Fix alert css for smaller viewports
Alert msgs are not aligned as expected in their enclosing divs on
smaller devices.To make them aligned its css is fixed so that
user experience can be improved.

PROD-1032
2020-02-24 17:31:28 +05:00
adeel khan
c43fc1fb0e Merge pull request #23173 from edx/transifex-bot-update-translations2020-02-24
fix(i18n): update translations
2020-02-24 17:03:38 +05:00
edX Transifex Bot
2562c0c171 fix(i18n): update translations 2020-02-24 10:53:19 +00:00
adeel khan
02195f3731 Merge pull request #23170 from edx/adeel/adding_compilejs_translations_via_makefile
Use django-statici18n to generate djangojs.js
2020-02-24 15:00:52 +05:00
zia.fazal@arbisoft.com
eeb390862c Use encodeURIComponent instead of encodeURI
We should use encodeURIComponent instead of encodeURI when encoding part of uri like querystring. encodeURI does not encode `+` sign. For example a query string parameter like `scope=user_id+profile+email` is not encoded by `encodeURI` which results in invalid url on select multiple enterprise page.

Fixed broken test
2020-02-24 12:58:15 +05:00
Adeel Khan
21535759de Use django-statici18n to generate djangojs.js 2020-02-24 12:56:25 +05:00
edX Transifex Bot
babd15259e fix(i18n): update translations 2020-02-23 16:33:36 -05:00
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