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

20732 Commits

Author SHA1 Message Date
atesker
bf14bc97d2 EDUCATOR-4920 Control permission to REST endpoint 
EDUCATOR-4920 Control permission to REST endpoint
CR1

EDUCATOR-4920 Control permission to REST endpoint
CR1
 2020-03-03 16:04:31 -05:00
Michael Terry
b96efcf71b Merge pull request #23258 from edx/mikix/experiment-flag 
Add ExperimentWaffleFlag
 2020-03-03 15:01:16 -05:00
Simon Chen
eb3e36b822 MST-121 We should allow the business case where a learner can be enrolled into a program, then unenrolled, then enroll into another program with the same course 2020-03-03 14:39:57 -05:00
Michael Terry
e724a4bcb7 Add ExperimentWaffleFlag 
This is a helpful class when running an experiment, to help
bucket users and keep track of which enrollments to consider
as part of the experiment.

AA-53
 2020-03-03 14:39:02 -05:00
Manjinder Singh
4399d13955 removing all of provider (#23269) 
* Revert "Ran make migration on third_party_auth (#23253)"

This reverts commit 49be65cc58.

* Removing provider.util import

* Removing further provider things

* Adding hash tests
 2020-03-03 10:42:18 -05:00
Awais Jibran
ca48c42214 Merge pull request #23245 from edx/aj/handle-not-enrolled-case-extentions 
Fix due date extension view.
 2020-03-03 20:36:19 +05:00
Ahtisham Shahid
be51e92c9e Merge pull request #23235 from edx/ahtisham/PROD-1330 
created logs to track edx-lti.org  errors
 2020-03-03 15:48:19 +05:00
Fred Smith
6433e88ac8 Merge pull request #20545 from ichintanjoshi/master 
fix very long horizontal scroll for RTL layout
 2020-03-02 15:07:24 -05:00
Diana Huang
0fa91d72db Remove DOP libraries from edx-platform. 
Remove DOP apps from INSTALLED_APPS.
Remove DOP libraries from requirements.
 2020-03-02 11:17:47 -05:00
Feanil Patel
5ec487452d Merge pull request #23188 from edx/robrap/BOM-1324-add-constraint 
BOM-1324: remove oauth2.enforce_jwt_scopes toggle
 2020-03-02 09:55:35 -05:00
Manjinder Singh
d08cd9ce04 Removing provider imports from edx-platform (#23229) 
* Removing from provider imports from openedx

 * removed all uses of retire_dop_oauth2_models

* Removing provider library from lms, common, and cms

Created/copied function short_token(from django-oauth-provider) and create_hash256 to help with conversion
 2020-03-02 08:56:54 -05:00
Ahtisham Shahid
1a82282cfd created logs to track lti erros 
added meta in logger

updated logs

updated logs
 2020-03-02 15:27:55 +05:00
Awais Jibran
5577539b0a Fix due date extension view. 
Return error when user is not enrolled in the course.
PROD-1339
 2020-03-02 12:03:14 +05:00
Adam Butterworth
04083cf4ab Allow chromeless courseware content to be centered (#23201) 
TNL-7093 Use inline styles to reset display to block from table-cell and width to auto
 2020-02-28 12:27:14 -05:00
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
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