Commit Graph

19803 Commits

Author SHA1 Message Date
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
edX cache uploader bot
dd0a184ebf Updating Bokchoy testing database cache (#23215) 2020-02-26 14:40:12 -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
Troy Sankey
84c6797897 Merge pull request #23206 from edx/revert-22851-juliasq/rename_site_configuration_siteconfiguration_values_2
Revert "Rename values in SiteConfiguration (2/3)"
2020-02-26 11:55:48 -05:00
edX cache uploader bot
0c91f64815 Updating Bokchoy testing database cache (#23204) 2020-02-26 11:41:49 -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
David Ormsbee
45c97c789d Merge pull request #20378 from open-craft/giovanni/bb-986-add-mktg-override-capability-upstream
BB-986: Add variable that allows overriding marketing urls
2020-02-26 09:45:35 -05:00
David Ormsbee
5ce6cecfed Re-enable caching of context processor output
In Django template rendering, context processors only run once.
But when we do template rendering through edxmako (which we do for
each and every web fragment/XBlock), we can end up having hundreds
of invocations of templates and run context processors for each
separately. This removes that work.

This was originally added in ad5cc3d5 and reverted when we saw
errors in one of our environments that seemed to be related to
context processor code. Those errors persisted after the revert,
and so I'm adding this back in (with some modifications based on
review comments).
2020-02-25 17:48:45 -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
Giovanni Cimolin da Silva
6305fbdfb6 Add mktg links override capability
This commit adds a feature that allows overriding any marketing URL, either by configuration on lms.env.json or SiteConfiguration, regardless if a marketing website is set up.
The links can be set by passing MKTG_URL_OVERRIDES to either `lms.env.json` or `SiteConfiguration`.
2020-02-25 13:51:58 -03:00
Jeff LaJoie
fa3b1cd835 AA-6: Adds in dates tab and dates dashboard view to courseware 2020-02-25 10:48: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
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
46e0ecfb89 Remove a bok-choy test that shouldn't have been a bok-choy test 2020-02-24 10:50:01 -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
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
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
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
edX cache uploader bot
31ca3769a3 Updating Bokchoy testing database cache (#23162) 2020-02-21 13:57:44 -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
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
edX cache uploader bot
7dadb5b98a Updating Bokchoy testing database cache (#23150) 2020-02-20 14:01:10 -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
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
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
Mike O'Connell
bc99a31738 Merge branch 'master' into ENT-2607-2 2020-02-19 14:01:28 -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
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
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
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
edX cache uploader bot
1369aa4333 Updating Bokchoy testing database cache (#23126) 2020-02-18 08:38:12 -05:00
Diego Millan
2dd128bce0 Setting template to show currency defined in the course mode DB record 2020-02-17 11:45:50 -04:00
Ahtisham Shahid
04421b648e Merge pull request #23041 from edx/ahtisham/PROD-920
Video Transcripts setting not preserved
2020-02-17 13:58:15 +05:00
Ahtisham Shahid
728f7d2c71 Updated Trascript functionality
removed extras

fixed initial state of transcript

Fixed js tests

fixed js tests

created and fixed tests

Updated Trascript functionality

updated v name

fixed spacing
2020-02-17 11:48:28 +05:00
Mike O'Connell
7d67dcfb59 Don't update account recovery until after activation
Corrected PEP8 errors

ENT-2607
2020-02-14 14:23:27 -05:00
Mike O'Connell
e5e96c9dde Don't update account recovery until after activation
Rather than to create or update the account recovery record when the
Account Settings page is updated, defer updating until the new
recovery email is confirmed

ENT-2607
2020-02-14 09:59:36 -05:00
Nathan Sprenkle
c66176da13 Add error reporting to UI for CSV team management (#23035)
* Add error banner for upload memberships errors

* Edit error message language

* Fix linter warnings
2020-02-14 09:58:58 -05:00
Kyle McCormick
234eedd8c6 Handle next and course_id in /login_ajax
Currently, the /login_ajax endpoint does not regard
any `next` or `course_id` parameters. This commit changes
that, sharing the logic that /login (which the current
templated login page uses) employs to cacluate
a redirect-after-login URL based on `next` and `course_id`.

The new functionality is behind ENABLE_LOGIN_MICROFRONTEND.
2020-02-13 12:24:51 -05:00
Awais Jibran
eaaebc6d93 Merge pull request #169 from edx/aj/sec-fix-capa
SECURITY FIX : Fix CAPA Problems
2020-02-13 13:52:29 +05:00
Jeremy Bowman
e1d1c29c00 Fix DRF deprecation warnings (#23082)
Fix all deprecation warnings generated by Django REST Framework during the unit tests:

* ``The `base_name` argument is pending deprecation in favor of `basename`.`` (86 occurrences)
* `` `detail_route` is deprecated and will be removed in 3.10 in favor of `action`, which accepts a `detail` bool. Use `@action(detail=True)` instead.`` (18 occurrences)
2020-02-12 12:51:40 -05:00
Saad Yousaf
6875ef3449 Merge pull request #23055 from edx/saad/PROD-1250
Studio export/import bug with problems having more than one pre-tag in problem.
2020-02-12 16:17:20 +05:00
edX cache uploader bot
2a1a936238 Updating Bokchoy testing database cache (#23081)
Bokchoy testing database update
2020-02-11 15:39:23 -05:00
Diana Huang
f6f77d19ba Merge pull request #23022 from edx/diana/remove-tracking-log-backend
Drop tracking log table.
2020-02-11 11:42:59 -05:00
Manjinder Singh
cce8cdd661 Replacing OAuth2Auth (#23067)
- Removing deprecated auth classes
- Replacing OAuth2AuthenticationAllowInactiveUserDeprecated with OAuth2AuthenticationAllowInactiveUser
- the old class was a child class of a deprecated class that we are removing and replacing.
2020-02-11 10:38:13 -05:00