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

53395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill DeRusha
6330dd1d54 Merge pull request #23240 from edx/bderusha/waffle-util-fix 
Fix Deprecation: log.warn -> log.warning
 2020-02-28 15:36:55 -05:00
Bill DeRusha
c1ebdaf0c3 Fix Deprecation: log.warn -> log.warning 2020-02-28 15:04:07 -05:00
edX cache uploader bot
cdad9a18fe Updating Bokchoy testing database cache (#23239) 2020-02-28 14:04:28 -05:00
Dave St.Germain
84e854d22c Merge pull request #23205 from edx/dcs/fix-tabs 
Add url_slug to the CourseOverviewTab, to support serializing StaticTabs
 2020-02-28 12:43:36 -05:00
Brittney Exline
b12790e405 Merge pull request #23237 from edx/bexline/ent2666 
Revert "BOM-1069"
 2020-02-28 10:39:23 -07: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
Brittney Exline
a22c676cac Revert "BOM-1069" 
This reverts commit 140738df4c.
 2020-02-28 09:52:49 -07:00
Ayub
6d6283f4e9 Merge pull request #23119 from edx/BOM-1069 
BOM-1069
 2020-02-28 18:48:37 +05:00
Ayub-khan
140738df4c BOM-1069 
-django-babel-underscore custom version to support django>=2.2
 2020-02-28 18:18:45 +05:00
Feanil Patel
2fa432beda Merge pull request #23231 from edx/feanil/fix_constraint_error 
Don't iterate over an empty filters list.
 2020-02-27 17:31:05 -05:00
Tim McCormack
341205a85d Launch celery directly instead of via django-celery (BOM-1157) (#23222) 2020-02-27 21:53:27 +00:00
Feanil Patel
54d7743817 Don't iterate over an empty filters list. 2020-02-27 16:32:43 -05:00
Manjinder Singh
953b0e728b Remove ThirdPartyAuthProviderApiPermission (#23195) 
* Remove ThirdPartyAuthProviderApiPermission

Also removed ProviderApiPermissions and ApiPermissionsAdminForm and removal of DOP for third_party_auth

* Removing model

* Replaced long_token with default_token_generator

* Adding skip to test_migrations_are_in_sync
 2020-02-27 15:42:09 -05:00
Calen Pennington
5cce110a91 Merge pull request #23217 from cpennington/edx-when-published-only 
Only extract published dates into edx-when
 2020-02-27 15:12:51 -05:00
Calen Pennington
5ea77433d3 Only extract published dates into edx-when 2020-02-27 14:10:12 -05:00
Troy Sankey
ac4fd6f91a Merge pull request #23224 from edx/revert-23214-pwnage101/rename_site_configuration_siteconfiguration_values_2.1 
Revert "Rename values in SiteConfiguration (2/3) attempt #2"
 2020-02-27 13:58:53 -05:00
Calen Pennington
6d2ad6aa2f Merge pull request #23219 from cpennington/fix-emails-no-weeks 
Don't try and multiply None with a number when computing number of we…
 2020-02-27 13:31:36 -05:00
Troy Sankey
e6f58b6d4c Revert "Rename values in SiteConfiguration (2/3) attempt #2" 2020-02-27 13:24:55 -05:00
Calen Pennington
70314cfa7b Don't try and multiply None with a number when computing number of weekly emails to send 2020-02-27 11:47:28 -05:00
Diana Huang
f945687582 Merge pull request #23207 from edx/msingh/remove_dop 
Removing dop code from oauth_dispatch
 2020-02-27 11:37:00 -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
Feanil Patel
fe22e77072 Merge pull request #23199 from edx/robrap/BOM-1292-remove-application-organization 
BOM-1292: remove uses of ApplicationOrganization
 2020-02-27 10:36:46 -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
Awais Jibran
18e21f374e Merge pull request #23216 from edx/fix-capa-promot-error-mit 
Workaround Error in find_question_label.
 2020-02-27 17:07:14 +05:00
AsadAzam
06bf775c3a Merge pull request #23175 from edx/asad/prod-1268 
Fixed duplicate asset on creating rerun
 2020-02-27 16:18:31 +05:00
asadazam93
364e534cf8 Fixed duplicate asset on creating rerun 2020-02-27 15:50:01 +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
Awais Jibran
9032562cbd Fix Error in find_question_label. 2020-02-27 10:55:18 +05:00
Jeremy Bowman
230bee9a06 Remove duplicate dependency version constraints (#23198) 
Remove duplicate constraints in requirements/constraints.txt uncovered by the recent change in pip-compile output format. I sorted the pinned dependencies by name to try and make it more obvious if this happens again. I also upgraded to pip-tools 4.5.1, which removes the line numbers from the enhanced pip-compile output added in 4.5.0, which should reduce future diff churn and merge conflicts but means that there's a large diff this one last time.

Also unpin edx-search again after the previous change to do that was apparently broken by a merge conflict.
 2020-02-26 20:42:21 -05:00
Feanil Patel
4a54967cc5 Replace the ApplicationOrganization in EdxOAuth2AuthorizationView 
Move to using the filters list provided in the ApplicationAccess model
to genarically store scopes instead of the org specific ApplicationOrg
model mapping.
 2020-02-26 16:02:39 -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
3400326e50 Fix migration issue with the missing method. 
This commit fixes an issue originally in 3541643d where an instance
method on a model was missing in a migration.  The problem was that
Django is smarter than we thought, and is somehow able to construct an
older version of the model before the commit, where there was no such
method.  The solution is just to pull the method out of the model.

DENG-18
 2020-02-26 14:44:14 -05:00
edX cache uploader bot
dd0a184ebf Updating Bokchoy testing database cache (#23215) 2020-02-26 14:40:12 -05:00
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
Troy Sankey
c422dec083 Revert "Revert "Rename values in SiteConfiguration (2/3)"" 
This reverts commit b85aa4b3fb.
 2020-02-26 12:54:24 -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
Feanil Patel
667df875bd Add back necessary import for ApplicationOrganization. 2020-02-26 11:30:59 -05:00
Feanil Patel
b6104b71fa Deal with linting violations. 2020-02-26 11:29:55 -05:00
Troy Sankey
b85aa4b3fb Revert "Rename values in SiteConfiguration (2/3)" 2020-02-26 11:23:56 -05:00
Dave St.Germain
8bedb4283d Add url_slug to the CourseOverviewTab, to support serializing StaticTabs. 2020-02-26 10:56:36 -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