Commit Graph

54964 Commits

Author SHA1 Message Date
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
Calen Pennington
aef3a20e5d Prioritize access denials in block transformers from groups that have messages associated with them 2020-06-25 09:51:50 -04:00
julianajlk
6dd820b6e3 Add Spanish translation to Financial Assistance form without breaking zendesk (#24309)
REV-1204 Add translation by marking string as translatable w/o translating at runtime
2020-06-25 08:50:23 -04:00
usamasadiq
987aa09768 Removed pymongo constraint in paver.in 2020-06-25 17:46:34 +05:00
adeelehsan
c127706ee7 Fixed XSS issues in xblock.js.
PROD-1660
PROD-1662
2020-06-25 14:09:20 +05:00
Eric Herrera
916307df1c Update exception name due to breaking changes introduced in mongoengine 0.19.0. 2020-06-24 20:46:56 -05:00
Eric Herrera
dcf9a3380a Remove mongoengine constraint to upgrade package avoiding raising StopIteration since after python 3.7 is produces an error. 2020-06-24 20:20:38 -05:00
Zachary Hancock
bcc1ddd375 add proctoring escalation contact setting (#24243) 2020-06-24 16:02:17 -04:00
Awais Qureshi
af3691ed52 Merge pull request #24311 from eduNEXT/eric/bom-1748
[BD-6] Order VideoBlock html metadata alphabeticallly to fix test.
2020-06-24 22:31:36 +05:00
Muhammad Ammar
6e4d8e9b08 Merge pull request #24283 from edx/ammar/ENT-2998-override-enrollment-attributes
override enrollment attributes for learners
2020-06-24 22:05:57 +05:00
muhammad-ammar
4a3eb16296 override enrollment attributes for learners
ENT-2998
2020-06-24 21:37:24 +05:00
Dillon Dumesnil
a7dff8c21e Merge pull request #24303 from edx/ddumesnil/due-dates-in-courseware-AA-44
AA-44: Adding due dates into courseware
2020-06-24 09:22:01 -07:00
Luis Moreno
ba297ab16c Solve quality issues 2020-06-24 12:10:09 -04:00
Eric Herrera
c40aa67fd0 Order VideoBlock html metadata alphabeticallly to fix test. 2020-06-24 12:07:55 -04:00
Luis Moreno
5fe377cc77 Attempt to fix db sync problem for python3.8 2020-06-24 11:58:23 -04:00
Kyle McCormick
c3d7ab9943 Fix programs cache ADR formatting (#24320) 2020-06-24 11:55:43 -04:00
morenol
8c53fa4a47 async is a keyword in python>=3.7 (#24265)
the new keyword async is causing errors when we run this with python 3.8.
https://docs.python.org/3/whatsnew/3.7.html

I tried in the first place, to change the definition of that value in the place where the context is defined, but it seems that it is taken from https://github.com/jazzband/django-pipeline,

This solves many problems for lms and cms tests that were making the jenkins workers get timeout.

That template have not seen changed since 2012, so I had to do additional changes in the templates in order to pass the xsslint checks:

mako-missing-default
mako-invalid-html-filter

I am not sure about the remove of the safe filter.

But I didn't found information about the 'safe' filter. It is probably that the now default 'h' filter is enough.
2020-06-24 11:55:03 -04:00
Dillon Dumesnil
7f6a2518cb AA-44: Adding due dates into courseware
Due dates will only display for graded subsections.
If the assignment has already been completed, there will be a pill
to indicate that. If the assignment is past due, there will be a
pill. If it is upcoming, there are no pills
2020-06-24 08:26:52 -07:00
Muhammad Ammar
0d0f8a1c6f Merge pull request #24319 from edx/jenkins/upgrade-python-requirements-39b109a
Python Requirements Update
2020-06-24 19:16:58 +05:00
edX requirements bot
6c441231fd Updating Python Requirements 2020-06-24 09:48:43 -04:00
Diana Huang
6aa300711b Remove usage of CourseRegistrationCode and blocked courses from
dashboard.
2020-06-24 09:38:20 -04:00
M. Zulqarnain
39b109a9ad Fixed bad escape character (#24316)
As of Python 3.7, a backslash-character pair that is not a valid escape sequence now generates an error, earlier it was a deprecation warning.
2020-06-24 18:23:11 +05:00