Commit Graph

53520 Commits

Author SHA1 Message Date
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
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