Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,274 Commits 1 Branch 0 Tags
9f8317665b4988aeb9b0fa431ca6fb13ff7abdca
Commit Graph

53274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bill DeRusha
4b04a3b92e Revert "Removing deprecated rest_framework_oauth library (#23127)" 
This reverts commit 1f32bc63ef.
 2020-02-19 08:46:03 -05:00
Ahtisham Shahid
cf41d6ebef Merge pull request #23123 from edx/ahtisham/PROD-452 
Fixed staff debug in instructor tab
 2020-02-19 16:33:49 +05:00
Ahtisham Shahid
62e1ad6216 Fixed binding issue 
updated selector

updated var name
 2020-02-19 13:39:05 +05:00
uzairr
2f080e8cd9 Add five seconds step to video slider 
Currently, video is moving one second ahead or behind on each right
and left arrow key respectively.In order to make it compliant with
the industry standards like Youtube,its step is adjusted to five
seconds.

PROD-159
 2020-02-19 13:34:54 +05:00
Jansen Kantor
0e0b488fb5 EDUCATOR-4876: Correctly handle 'None' as a valid max_team_size (#23038) 
add default max team sizes, change ui to not show max for managed teams
 2020-02-18 16:44:20 -05:00
Dillon Dumesnil
39a59cbe33 Merge pull request #23133 from edx/ddumesnil/relevant-dates-AA-4 
Adding in try block for getting item from modulestore
 2020-02-18 15:57:40 -05:00
Marco Morales
9dc5457d07 Merge pull request #23117 from edx/marco/studio-learning-sequence-nav/styling-changes 
Styling updates to Studio Unit Page Sequence navigation
 2020-02-18 15:50:37 -05:00
Alex Dusenbery
aea6a373fa Upgrade ORA to 2.6.10 | Team submissions should also include file uploads from the submitter. 2020-02-18 15:34:23 -05:00
Dillon Dumesnil
a7a84ce9ab Adding in try block for getting item from modulestore 
This also includes updating the test to actually test for this use case

AA-4
 2020-02-18 15:23:38 -05:00
Ned Batchelder
626b35cd16 Merge pull request #22637 from thraxil/bookmarks-update-exblocks-cache-task-name 
update bookmarks update_xblocks_cache celery task name
 2020-02-18 15:15:10 -05:00
edX requirements bot
45ffefe8cb Updating Python Requirements (#23125) 2020-02-18 19:38:04 +00:00
Diana Huang
c99bf692cc Remove class_dashboard. 2020-02-18 13:35:26 -05:00
Manjinder Singh
d7bd80a100 Renamed OAuth2Authentication to BearerAuthentication (#23128) 
* Renamed OAuth2Authentication to BearerAuthentication
* Added back OAuth2Authentication name
-there are libraries such as edx-enterprise that still import OAuth2Authentication.  The OAuth2Authentication class should be fully removed when everything is importing BearerAuthentication correctly
 2020-02-18 13:29:29 -05:00
Awais Qureshi
d6ffabe5c4 Merge pull request #23107 from edx/awais786/BOM-1278 
BOM-1278
 2020-02-18 23:05:35 +05:00
Dillon Dumesnil
401a37dde5 Merge pull request #23079 from edx/ddumesnil/relevant-dates-AA-4 
AA-4: Show relevant dates in course dates sidebar
 2020-02-18 12:47:31 -05:00
Awais Qureshi
16c7f0a6b4 BOM-1278 
Upgrade django-toolbar.
 2020-02-18 22:38:48 +05:00
Dillon Dumesnil
be7ef9804d AA-4: Adding waffle flag for dates widget 2020-02-18 11:20:32 -05:00
Manjinder Singh
1f32bc63ef Removing deprecated rest_framework_oauth library (#23127) 2020-02-18 11:17:27 -05:00
Manjinder Singh
2274cd09b4 Added options to pytest calls (#23083) 
- added more default options to pytest calls in setup.cfg and pytest.ini files.
- pytest-json-report's plugin name in pluggy has changed, so added option for multiple names
 2020-02-18 08:58:44 -05:00