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

53174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
829aa23db3 Merge pull request #23091 from cpennington/replace-coverage-contexts-during-upload 
Replace old coverage context files when uploading
 2020-02-12 13:00:46 -05:00
adeelehsan
47393b5f7e Merge pull request #23089 from edx/aehsan/prod-1229/changed_microbachelors_to_micro 
MicroBachelor changed to Micro
 2020-02-12 22:59:40 +05:00
Jeremy Bowman
e1d1c29c00 Fix DRF deprecation warnings (#23082) 
Fix all deprecation warnings generated by Django REST Framework during the unit tests:

* ``The `base_name` argument is pending deprecation in favor of `basename`.`` (86 occurrences)
* `` `detail_route` is deprecated and will be removed in 3.10 in favor of `action`, which accepts a `detail` bool. Use `@action(detail=True)` instead.`` (18 occurrences)
 2020-02-12 12:51:40 -05:00
Calen Pennington
06d0d9f3e1 Merge pull request #23086 from edx/nedbat/relative_coverage_files 
Use relative_files setting for coverage
 2020-02-12 11:43:19 -05:00
Calen Pennington
646cf1ed12 Replace old coverage context files when uploading 2020-02-12 11:29:32 -05:00
Calen Pennington
0031d07b86 Merge pull request #23085 from cpennington/upload-coverage-content 
Pipe COLLECT_WHO_TESTS_WHAT through to jenkins-report.sh so that we u…
 2020-02-12 10:09:17 -05:00
Saad Yousaf
6875ef3449 Merge pull request #23055 from edx/saad/PROD-1250 
Studio export/import bug with problems having more than one pre-tag in problem.
 2020-02-12 16:17:20 +05:00
adeelehsan
a41f992e10 MicroBachelor changed to Micro 
PROD-1229
 2020-02-12 15:27:25 +05:00
adeel khan
4bf736c854 Merge pull request #23078 from edx/adeel/prod_960_fixing_translations_failure 
Removing paver command
 2020-02-12 12:15:38 +05:00
edX cache uploader bot
2a1a936238 Updating Bokchoy testing database cache (#23081) 
Bokchoy testing database update
 2020-02-11 15:39:23 -05:00
Ned Batchelder
fbe8128360 Use relative_files setting for coverage 
This should make it easier to measure coverage in one place (Travis) and
work with it in another (devstack).
 2020-02-11 15:21:04 -05:00
Calen Pennington
ef80230700 Pipe COLLECT_WHO_TESTS_WHAT through to jenkins-report.sh so that we upload coverage contexts nightly 2020-02-11 15:04:00 -05:00
Manjinder Singh
def4d6e498 Updated edx-organization version (#23080) 2020-02-11 13:52:13 -05:00
Adeel Khan
5dae91bdf8 Removing paver command 
This is not needed in Makefile as
all the logic and invocation of
compilejs would be done via
ecommerce-script repo.

PROD-960
 2020-02-11 23:24:39 +05:00
Diana Huang
f6f77d19ba Merge pull request #23022 from edx/diana/remove-tracking-log-backend 
Drop tracking log table.
 2020-02-11 11:42:59 -05:00
Manjinder Singh
03a3c201cb Moved hooks around (#23077) 
This change only implements pytest hooks when we know pytest_json_report plugin has
been loaded. Previously, the hooks were being loaded before plugin, thus causing errors
cause(pytest_sessionfinish needs the plugin to function).
 2020-02-11 10:38:36 -05:00
Manjinder Singh
cce8cdd661 Replacing OAuth2Auth (#23067) 
- Removing deprecated auth classes
- Replacing OAuth2AuthenticationAllowInactiveUserDeprecated with OAuth2AuthenticationAllowInactiveUser
- the old class was a child class of a deprecated class that we are removing and replacing.
 2020-02-11 10:38:13 -05:00
adeelehsan
da23496535 Merge pull request #23071 from edx/aehsan/prod-1188/monog_socket_timeout_increased 
Mongo socket timeout increased.
 2020-02-11 19:58:00 +05:00
Diana Huang
67ecee91e4 Drop tracking log table. 2020-02-11 09:34:26 -05:00
saadyousafarbi
dd994657ac use xpath instead of tag to get all matches from subtree instead of subelements. 2020-02-11 18:59:24 +05:00
Christie Rice
1167ce74c8 MICROBA-149 Create external user id tables (#23064) 
* MICROBA-149 Create user id tables

* Move to openedx

* Rename app in doc

* Update PII tag

* Update doc
 2020-02-11 08:17:28 -05:00
Aarif
36d06e949e Merge pull request #22903 from edx/BOM-1068 
Replaced jsonfield with jsonfield2 - BOM-1068
 2020-02-11 17:15:19 +05:00
Ayub
a33b5e441c Merge pull request #23070 from edx/BOM-1121-2 
BOM-1121
 2020-02-11 17:11:01 +05:00
Aarif
c9309a4b41 replaced jsonfield with jsonfield2 2020-02-11 16:17:51 +05:00
adeelehsan
374ecba38c Mongo socket timeout increased 
prod-1188
 2020-02-11 15:42:37 +05:00
Ayub-khan
d3a02bc3e5 BOM-1121 
-Updated middleware setting to use use middleware insted of
middleware_classes
-github install of django-method-override fork to support
new style middleware in django1.11
 2020-02-11 14:35:26 +05:00
Zaman Afzal
a9bd66b480 bump edx-enterprise-version (#23060) 2020-02-11 10:28:20 +05:00
Michael Terry
69418e3633 Merge pull request #23065 from edx/mikix/rel-date-waffle 
Add relative dates waffle flag
 2020-02-10 14:22:03 -05:00
Michael Terry
f684d2b541 Add relative dates waffle flag 
Specifically, course_experience.relative_dates. This will be used
by future PRs to control our rollout of this new feature.

AA-27
 2020-02-10 13:41:40 -05:00
Adam Butterworth
53c1d2a0da Hide display titles for vertical blocks embedded in microfrontends (#23006) 
Relates to TNL-7048. Since bookmarking is handled in the courseware microfrontend, it needs to also manage the display of a unit title.
 2020-02-10 13:32:08 -05:00
Jeremy Bowman
59768e7498 Fix more deprecation warnings (#23061) 2020-02-10 13:17:25 -05:00
Dillon Dumesnil
b4fed7c2a4 Merge pull request #23063 from edx/ddumesnil/revert-AA-4 
Revert commits for AA-4
 2020-02-10 13:11:19 -05:00
Dillon Dumesnil
00fe1495b4 Revert commits for AA-4 2020-02-10 12:10:59 -05:00
Feanil Patel
4422fb36cf Merge pull request #23037 from edx/feanil/bom-939 
BOM-939 Update pickle procotol version.
 2020-02-10 11:36:20 -05:00
Manjinder Singh
f08185443e Adding new settings to correct places (#23051) 
These settings are used to toggle new authentication class in discussion and bookmarks app. The auth class is in openedx/core/lib/api/authentication.py and was added to replace deprecated OAuth2Authentication class in [rest_framework_oauth library](https://github.com/jpadilla/django-rest-framework-oauth)
 2020-02-10 10:17:31 -05:00
Simon Chen
cf34c2cd94 Disable the xss lint violation alert for the code do not expose xss vulnerability 2020-02-10 10:12:44 -05:00
Dillon Dumesnil
9b9c261c77 Merge pull request #23058 from edx/ddumesnil/relevant-dates-AA-4 
AA-4: Be more defensive about not finding an item in modulestore
 2020-02-10 09:36:50 -05:00
Jeremy Bowman
eea83cde4d Increase xdist worker startup timeout (#23059) 2020-02-10 09:25:00 -05:00
David Ormsbee
76a7d40065 Merge pull request #23047 from edx/ormsbee/update_config_models 
Python upgrades (django-config-models v2)+
 2020-02-10 09:13:10 -05:00
Hasnain Naveed
535869ff15 Merge pull request #22790 from edx/hasnain-naveed/ENT-2511 
ENT-2511 | Disabled the admin panel's login page.
 2020-02-10 18:23:53 +05:00
Alan Zarembok
804e1c3b8e Merge pull request #23034 from edx/azarembok/cert-url 
PROD-1236: Change URL returned for generated certificates to use UUID.
 2020-02-10 08:18:12 -05:00
Dillon Dumesnil
7b68869a14 AA-4: Be more defensive about not finding an item in modulestore 2020-02-10 08:03:16 -05:00
Zia Fazal
26891841e4 Merge pull request #22987 from edx/ziafazal/ENT-2269 
ENT-2269: Added ability to logout from IDP when logout flow is triggered from learner portal
 2020-02-10 12:53:41 +05:00
Syed Muhammad Dawoud Sheraz Ali
cc42ebb51a Merge pull request #22954 from edx/dsheraz/PROD-347 
add multiple correct values check for Dropdown problems
 2020-02-10 12:26:32 +05:00
Zainab Amir
644d4d44bc Add condition to fix incorrectly set schedules (#23028) 
Choose max of course start or enrollment created date when
schedule start date is in the past

PROD-1198
 2020-02-10 11:51:52 +05:00
DawoudSheraz
0b1c7db967 add multiple correct values check for Dropdown problems 2020-02-10 11:36:28 +05:00
David Ormsbee
b134228954 Python upgrades (django-config-models v2)+ 
Some tests that used to mock the cache internals of ConfigurationModels
had to be modified to use CacheIsolationTestCase instead (the things
they were mocking no longer exist).
 2020-02-09 20:37:45 -05:00
Dillon Dumesnil
2e71793ba5 Merge pull request #23044 from edx/ddumesnil/relevant-dates-AA-4 
AA-4: CSS updates in date widget
 2020-02-08 13:49:00 -05:00
David Ormsbee
ff8ecd4b40 Merge pull request #23040 from edx/jenkins/upgrade-python-requirements-e60140d 
Python Requirements Update
 2020-02-07 13:37:53 -05:00
Dillon Dumesnil
490e93635f AA-4: CSS updates in date widget 2020-02-07 11:53:23 -05:00