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

53356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert (AJ) St. Aubin
fce217b0dc Merge pull request #23148 from edx/aj/MICROBA-150 
MICROBA-150 Creating EnternalIds for users enrolling in MB Programs
 2020-02-26 14:07:19 -05:00
Awais Jibran
ad4d992624 Merge pull request #23202 from edx/aj/update-pavelib-prereqs 
Fix Pavelib prereqs.
 2020-02-26 23:40:12 +05:00
Albert (AJ) St. Aubin
b1bbfc7065 Creating EnternalIds for users enrolling in MB Programs 2020-02-26 13:35:31 -05:00
Awais Jibran
9f456e28b7 Fix Pavelib prereqs. 
Do not read file as bytes, as it would fail the comparison of byte with str.
PROD-1322
 2020-02-26 22:48:20 +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
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
David Ormsbee
b501cc196f Merge pull request #23031 from edx/revert-22779-ormsbee/revert_context_processor_cache 
Re-enable caching of context processor output
 2020-02-26 09:44:14 -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
Tim McCormack
95d4acad7c Minimize dependency on django-celery (#23193) 
- Reimplement `djcelery.common.respect_language` utility function so we
  can drop the dependency.
- Loosen `celery` pinning to a range, which brings in a fix for a
  possible crash bug

Also, pin `path` to 13.1.0 for now in order to continue supporting py35.
 2020-02-26 00:46:36 +00: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
Ned Batchelder
2eeae3b9ad Merge pull request #22164 from open-craft/jill/log-heartbeat-failures 
SE-1773 Logs failed heartbeat checks
 2020-02-25 16:00:52 -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
David Ormsbee
8c7dc22dfe Merge pull request #23068 from open-craft/olx-rest-api 
REST API to export modulestore XBlocks as OLX
 2020-02-25 15:11:08 -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
7b3baae4d3 Merge pull request #23194 from edx/diana/remove-from-logout-flow 
Remove more references to the old edx_oauth2_provider library.
 2020-02-25 14:17:04 -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
edX requirements bot
79bcc9ede8 Updating Python Requirements (#23190) 2020-02-25 13:41:15 -05:00
Diana Huang
4fb7f9bfab Remove oauth2_handler djangoapp. 2020-02-25 13:15:08 -05:00
Diana Huang
d5ae5c3a8e Remove wrapper code from logout flow. 2020-02-25 13:06:42 -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
David Ormsbee
7ec58fd721 Merge pull request #19906 from open-craft/opencraft/edx-platform/devan/editable-weekly-course-highlight-emails 
Allow a configurable number of weekly course highlight emails
 2020-02-25 10:59:30 -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
pkulkark
b31ca38fbd Adds weeks argument to send_course_update management command. 2020-02-25 20:53:41 +05:30
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
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
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
Matt Hughes
4f70bf6138 increase timeout for proctortrack pings accommodating common crashes 
JIRA:CR-1597
 2020-02-24 15:01:52 -05:00
Calen Pennington
87059e7693 Merge pull request #23181 from cpennington/show-due-dates-self-paced-from-edx-when 
Show due dates self paced from edx when
 2020-02-24 13:59:41 -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
Robert Raposa
a3ac11cd8b Merge pull request #23182 from edx/robrap/BOM-1324-add-constraint 
BOM-1324: add constraint for edx-drf-extensions
 2020-02-24 13:00:02 -05:00
Calen Pennington
f3bce46757 Allow due-dates for self-paced courses in the course outline 2020-02-24 12:43:09 -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
Dave St.Germain
f70ca08fef Merge pull request #23180 from edx/dcs/learning-slash 
Learning MFE URL should not have a slash
 2020-02-24 11:15:14 -05:00
Calen Pennington
9f8844e76d Merge pull request #23177 from edx/revert-23161-show-due-dates-self-paced 
Revert "Allow due-dates for self-paced courses in the course outline"
 2020-02-24 10:59:17 -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
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
Robert Raposa
ce0b424254 add constraint for edx-drf-extensions 
There is a planned edx-drf-extension update to 3.0.0 to remove the
toggle used for ENFORCE_JWT_SCOPES. Currently, edx-platform is dependent
on the this toggle. This constraint will keep other `make upgrade` PRs
working in the short window before the edx-paltform PR to remove the
same toggle can land.

BOM-1324
 2020-02-24 10:25:57 -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
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