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

54935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waheed Ahmed
cb8556bfa6 Merge pull request #182 from edx/aehsan/fix_xss_linting_issues 
fixed xss linting issues
 2020-06-30 19:30:25 +05:00
Dave St.Germain
39639fef65 Merge pull request #24349 from edx/dcs/update-lti 
Upgrade lti-consumer-xblock
 2020-06-30 10:18:15 -04:00
Awais Qureshi
d156cae333 Merge pull request #24330 from eduNEXT/lmm/regex_deprecation_warning 
[BD-6] Fix invalid escape sequence deprecation warning.
 2020-06-30 19:13:33 +05:00
Saleem Latif
199631a2d5 Merge pull request #24248 from edx/saleem-latif/ENT-2657 
ENT-2657: Added COURSE_CATALOG_URL_ROOT to django settings
 2020-06-30 18:16:55 +05:00
Dave St.Germain
b03b5744da Upgrade lti-consumer-xblock 2020-06-30 08:59:38 -04:00
Saleem Latif
85bf89db3e Added COURSE_CATALOG_URL_ROOT to django settings 2020-06-30 14:19:54 +05:00
Zachary Hancock
02305408fd fix to apply changes from #24325 in edx theme (#24354) 2020-06-29 19:40:30 -04:00
Michael Terry
f1af32990f Merge pull request #24351 from edx/downgrade-pycontracts 
Downgrade pycontracts to 1.8.12
 2020-06-29 16:11:47 -04:00
Michael Terry
a1672db5dc Downgrade pycontracts to 1.8.12 
They seem to have removed 1.8.14 from pypi.
 2020-06-29 15:22:41 -04:00
Mike OConnell
2271f3112e Merge pull request #24347 from edx/moco/ENT-3049-2 
Check current enterprise for consent
 2020-06-29 14:14:19 -04:00
Michael Terry
e8c2f351fe Merge pull request #24289 from edx/mikix/masquerade-learning-mfe 
AA-177: Add masquerading for course home MFE
 2020-06-29 13:10:26 -04:00
Zachary Hancock
6afbb9827b remove unenroll button for masters enrollments (#24325) 
* remove unenroll for masters

* i18n string
 2020-06-29 12:57:46 -04:00
Mike O'Connell
d191b52ee9 Check current enterprise for consent 
When checking if consent is needed, ignore any enterprise
learner details that are not for the learner's currently
active enterprise.

ENT-3049
 2020-06-29 12:57:03 -04:00
Michael Terry
3030efec78 AA-177: Add masquerading for course home MFE 
- Looks at masquerading config for dates, outline, metadata, and
  celebration APIs in course_home_api / courseware_api.
- Consolidates and cleans up places we check whether masquerading
  gives us full access to a course.
 2020-06-29 12:37:47 -04:00
Mike OConnell
9f14fcb57d Merge pull request #24346 from edx/jenkins/upgrade-python-requirements-cf5f948 
Python Requirements Update
 2020-06-29 12:28:15 -04:00
Matthew Piatetsky
014d7952a7 Merge pull request #24345 from edx/REV-1226 
[REV-1226] Temporarily increase default throttle rates for service user
 2020-06-29 11:51:42 -04:00
edX requirements bot
2922a4db96 Updating Python Requirements 2020-06-29 11:29:28 -04:00
Matthew Piatetsky
c8dd6e5d58 Temporarily increase default throttle rates for service user to handle increased throughput against data sharing consent endpoint 2020-06-29 11:20:35 -04:00
Feanil Patel
cf5f9482e3 Merge pull request #23975 from edx/depr/shoppingcart-instructor-report 
instructor_task: remove shoppingcart (DEPR-43)
 2020-06-29 11:05:26 -04:00
Nimisha Asthagiri
80ea0a61f0 instructor_task: remove shoppingcart (DEPR-43) 2020-06-29 10:28:26 -04:00
Feanil Patel
d6c1ec57d3 Merge pull request #23751 from alanoe/alanoe/fix_npm_install_error_handling_in_master 
Fix 'npm install' command execution error handling
 2020-06-29 10:00:48 -04:00
edX cache uploader bot
7bfbd3104e Updating Bokchoy testing database cache (#24334) 2020-06-29 13:58:42 +00:00
alangsto
d694582441 Displays escalation email on Special Exams tab (#24331) 
* Displays escalation email on Special Exams tab of instructor dashboard. MST-274

* updates for requested changes

* updates necessary for unit testing

* Fixes for pylint warning

* fix for quality tests
 2020-06-29 09:11:48 -04:00
Awais Jibran
c106bfd83f Merge pull request #24254 from edx/aj/update-id-v-emails 
Updating ID Verification Approved email template.
 2020-06-29 13:07:35 +05:00
Awais Jibran
0142dcdf86 Adding ID Verification Approved email template. 
PROD-1639
 2020-06-29 12:17:55 +05:00
edX Transifex Bot
ce9d22254b fix(i18n): update translations 2020-06-28 17:45:57 -04:00
Aarif
9e34cb3df9 Removed deprecated future imports (#24295) 2020-06-28 23:40:03 +05:00
Feanil Patel
1e4866e89b Merge branch 'master' into alanoe/fix_npm_install_error_handling_in_master 2020-06-26 15:58:37 -04:00
Ben Warzeski
64e8332d38 Topic teams actions (#24336) 
* modern eslint allowances

* update topic teams to request team membership per local teamset

* update tests for topic_teams change

* cleanup

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-06-26 14:46:51 -04:00
Luis Moreno
600b8bcdd5 Fix invalid escape sequence deprecation warning. 2020-06-26 13:49:41 -04:00
Danial Malik
c962423bbc Replace track calls with eventtracking in task_track and server_track (#24282) 
* Replace track calls with eventtracking in task_track and server_track

* Making  events compatible with events emitted via track app

* Fixed broken tests and quality violation

* Removed useless changes in shim. using  in  to have  and  keys in event context

Co-authored-by: zia.fazal@arbisoft.com <zia.fazal@arbisoft.com>
 2020-06-26 13:49:16 -04:00
morenol
a4a7e63ef8 Remove usage of enum34, since we are already in python>=3.4 (#24337) 
enum34 is causing problems in python3.8 tests of edx-platform because it has incompatibility with recent versions of python, the error the error happens while importing the re module in these python versions.

This library is a backport of enum of python3.4 made for python<3.4, therefore is not needed anymore.

edx-val was updated to remove that dependency: https://github.com/edx/edx-val/pull/245
 2020-06-26 13:13:12 -04:00
Nathan Sprenkle
835ccafa5d Fix team size validation issue (#24290) 
* Edit team manage to check sizes at end of import

* Fix size validation to take new teams into account

* Remove redundant max size check

* Consolidate team membership counters

* Remove unused user_ids_by_teamset_id set

* Fix team removal to only occur after validation

* Update team full error message

* Prefetch users when looking up team counts
 2020-06-26 11:55:36 -04:00
Brittney Exline
f67961dec5 Merge pull request #24332 from edx/bexline/upgrade_edx_enterprise 
Upgrading edx-enterprise to 3.3.11
 2020-06-26 07:35:27 -06:00
Ali Akbar
e4bf35e556 Merge pull request #24313 from edx/aakbar/PROD-1688 
allow moderators to post in forum
 2020-06-26 17:00:47 +05:00
Ali-D-Akbar
e319e84969 allow moderators to post in forum 2020-06-26 16:29:54 +05:00
Usama Sadiq
d01c721859 Merge pull request #24259 from edx/usamasadiq/bom-1742-pymongo-constraint-removal 
Removed pymongo constraint in paver.in
 2020-06-26 14:40:54 +05:00
Zainab Amir
0b80987ba0 Add vem_enabled_courses_percentage (#24294) 
Add a field to VEM config model that will decide the percentage of
courses allowed to go to VEM pipeline. The courses that don't meet the
criteria will go to VEDA.

PROD-1722
 2020-06-26 14:30:42 +05:00
M. Zulqarnain
32643eada2 removed waffle constraint (#24333) 2020-06-26 13:38:45 +05:00
Brittney Exline
506e70b7ef Upgrading edx-enterprise to 3.3.11 2020-06-25 15:19:22 -06:00
Matt Tuchfarber
4f1cd91113 Re-Add demographics prompt to edx.org theme (#24231) 
- Add bootstrap utility function to lms-base-v1 CSS
- Moved coaching sass to edx.org theme
- Banner feature flag and MB program gated
- Fixes previous issue of changes specificity in button selector by
  resetting the style inside the component's class
 2020-06-25 14:47:08 -04:00
Awais Qureshi
a16bc22876 Merge pull request #24310 from eduNEXT/eric/bom-1746 
[BD-6] Separate tests according to the python version, due to incompatibilities in sorted dicts.
 2020-06-25 23:05:25 +05:00
Diana Huang
8a1fad8c12 Merge pull request #24181 from edx/diana/dashboard-courses-blocked 
DEPR-43: Remove usage of CourseRegistrationCode and blocked courses from
 2020-06-25 13:59:26 -04:00
Awais Qureshi
b99210f077 Merge pull request #24326 from edx/BOM-1811 
Fixing assert_has_calls() failure due to order difference
 2020-06-25 22:37:29 +05:00
edX requirements bot
c0293660e8 Updating Python Requirements (#24324) 2020-06-25 17:18:26 +00:00
Awais Qureshi
bbe9d19c01 BOM-1811 
assert_has_calls() has different order of specified calls.
if any_order is true then the calls can be in any order,
but they must all appear in mock_calls.

https://docs.python.org/3/library/unittest.mock.html#unittest.mock.Mock.assert_has_calls
 2020-06-25 22:04:48 +05:00
Eric Herrera
bf945e2aec Separate tests according to the python version, due to incompatibilities in sorted dicts. 2020-06-25 11:35:21 -04:00
Awais Qureshi
05b98cbba2 Merge pull request #24297 from eduNEXT/lmm/try_to_fix_migration_problem 
[BD-6] Attempt to fix db sync problem for python3.8
 2020-06-25 20:29:29 +05:00
Awais Qureshi
e4c891edb5 Merge pull request #24312 from eduNEXT/eric/monogengine_upgrade 
[BD-6] Upgrade mongoengine
 2020-06-25 20:22:21 +05:00
Calen Pennington
d933541dad Merge pull request #24302 from cpennington/prioritize-access-denied-messages 
Prioritize access denied messages
 2020-06-25 10:15:57 -04:00