Commit Graph

20697 Commits

Author SHA1 Message Date
Jeff LaJoie
4a0d7d3c73 Merge pull request #23196 from edx/jlajoie/fix-dates-tab-enabled
AA-6: Fixes up the logic on when to display the dates tab
2020-02-25 15:33:34 -05:00
Dave St.Germain
a77c0f514a Merge pull request #20806 from open-craft/gr4yscale/send-direct-link-to-course-in-emails
Add link to course url in the account creation and enrollment email
2020-02-25 15:17:14 -05:00
Jeff LaJoie
9976cd0884 AA-6: Fixes up the logic on when to display the dates tab 2020-02-25 14:42:42 -05:00
Diana Huang
4fb7f9bfab Remove oauth2_handler djangoapp. 2020-02-25 13:15:08 -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
Tyler Powers
638a9e4def Add link to course url in the account creation and enrollment email 2020-02-25 19:04:08 +02: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
Jeff LaJoie
fa3b1cd835 AA-6: Adds in dates tab and dates dashboard view to courseware 2020-02-25 10:48:45 -05:00
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
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
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
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
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
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
edX Transifex Bot
2562c0c171 fix(i18n): update translations 2020-02-24 10:53:19 +00: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
edX Transifex Bot
babd15259e fix(i18n): update translations 2020-02-23 16:33:36 -05:00
Dillon Dumesnil
bb1981de6c AA-34: Add UserCalendarSyncConfig Model 2020-02-21 14:21:20 -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
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
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
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
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
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
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
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
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
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
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
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