Commit Graph

22621 Commits

Author SHA1 Message Date
Tim McCormack
341205a85d Launch celery directly instead of via django-celery (BOM-1157) (#23222) 2020-02-27 21:53:27 +00:00
Troy Sankey
e6f58b6d4c Revert "Rename values in SiteConfiguration (2/3) attempt #2" 2020-02-27 13:24:55 -05:00
jinder1s
295da79fe5 Remove DOP dispatching from oauth_dispatch.
https://openedx.atlassian.net/browse/BOM-1330
2020-02-27 10:47:06 -05:00
Troy Sankey
3fdd08b683 Merge pull request #23214 from edx/pwnage101/rename_site_configuration_siteconfiguration_values_2.1
Rename values in SiteConfiguration (2/3) attempt #2
2020-02-27 10:34:37 -05:00
Robert Raposa
ebf99fd857 move override 2020-02-27 10:29:03 -05:00
Robert Raposa
c291e4a521 fix tests and requirements
try to fix github
2020-02-27 09:56:31 -05:00
Robert Raposa
e2cc7fa348 fix failing tests 2020-02-27 09:00:01 -05:00
Robert Raposa
a4716c75cb fix tests 2020-02-27 08:58:45 -05:00
Robert Raposa
84686e81c3 BOM-1324: remove oauth2.enforce_jwt_scopes toggle
The oauth2.enforce_jwt_scopes waffle switch was added temporarily for
the rollout of jwt scopes. This removes the toggle and replacing code
with the equivalent of `oauth2.enforce_jwt_scopes` as True.
2020-02-27 08:58:45 -05:00
Waheed Ahmed
9bd85dc929 Fix certificates API for old deleted XML course certificates.
Certificates API is retuning 500 error for old XML courses in which learners
have a valid certificate.

PROD-1247
2020-02-27 13:13:13 +05:00
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
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
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
Manjinder Singh
e9e584b28b Removing DOP from auth_exchange (#23187)
-  This PR removes all imports from provider by either bringing them into edx-platform or finding dot replacement. Removing tests that tested dop parts of code. 

-  Skipping some tests and removing dop

The tests are difficult to fix due to its entanglement with dop use in third_party_auth.
These tests should be restarted once dop has been removed from third_party_auth and its tests.

-  set ENABLE_DOP_ADAPTER = False for devstack
2020-02-26 10:21:26 -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
Adam Butterworth
459cecc4f9 Update preview link alignment in masquerade bar (#23192)
Relates to TNL-7076
2020-02-26 09:09:23 -05:00
HammadAhmadWaqas
b99977a3cb added management command to push old enrollments to ecommerce 2020-02-26 17:41:05 +05:00
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
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
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
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
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