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

54954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edX cache uploader bot
691649362e Updating Bokchoy testing database cache (#24374) 2020-07-02 09:51:28 -04:00
edX requirements bot
0e4fe2eb15 Updating Python Requirements (#24383) 2020-07-02 17:59:36 +05:00
Awais Jibran
215c4cddb9 Merge pull request #24382 from edx/aj/update-id-v-emails-patch 
Patch IDV emails approved
 2020-07-02 15:30:19 +05:00
Awais Jibran
44bde2f9da Patch IDV emails approved 2020-07-02 14:47:09 +05:00
edX Transifex Bot
cb0973317e geoip2: update maxmind geolite country database 2020-07-01 17:16:01 -04:00
Ben Warzeski
d99890fb1a Team card teamset name (#24360) 
* show teamset as pennant in team cards within my_teams view

* update verifyCards spec helper to be able to check teamset label

* update tests for team_card teamset label.

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-07-01 15:37:45 -04:00
Tim McCormack
bba346cb7f Unpin PyJWT to unblock use of Apple auth backend (ARCHBOM-1281) (#24375) 
...and pin django-ipware for the moment
 2020-07-01 17:55:34 +00:00
edX Transifex Bot
fba65965f2 fix(i18n): update translations 2020-07-01 11:47:50 -04:00
Saleem Latif
625b85c836 Merge pull request #24370 from edx/saleem-latif/ENT-2657-bug-fix 
Fixed COURSE_CATALOG_URL_ROOT attribute error for studio
 2020-07-01 18:29:59 +05:00
Saleem Latif
300d361de4 Fixed COURSE_CATALOG_URL_ROOT attribute error for studio 2020-07-01 15:27:37 +05:00
Awais Qureshi
232fd14f65 Merge pull request #24356 from edx/BOM-1843-ddt 
BOM-1521
 2020-07-01 12:39:31 +05:00
Awais Qureshi
d3f3c87186 BOM-1521 
Removing ddt constraint.
 2020-07-01 11:50:41 +05:00
Jeremy Bowman
76ad393cd1 Pin edx-enterprise until bug in new releases is fixed ARCHBOM-1324 (#24366) 
The new releases end up importing code in Studio that relies on an LMS-only setting. Pinning until resolved.

Also pinning edx-completion until the test failures in #24365 get resolved.
 2020-06-30 17:13:10 -04:00
Tim McCormack
ff203efe1f Envs doc updates: Django version, update aws.py reference in image (#24364) 
- Reference correct version of Django docs
- Updates to LMS envs diagram:
    - Rename aws.py reference in image (now production.py)
    - Remove deprecated and deleted environments
- Update note on `devstack_docker.py` to explain history
 2020-06-30 20:14:41 +00:00
stvn
dbfbc4bb32 Merge PR #24215 deprecate/studio/old-course-keys 
* Commits:
  Add Studio warning for deprecated course keys
 2020-06-30 12:55:10 -07:00
stvn
65db925948 Add Studio warning for deprecated course keys 
in preparation of dropping support for them entirely.

Re: timing: We will _not_ be going live with this on edx.org at launch;
we'll override this setting on our own installs, initially.

We do, however, want to get this merged ASAP, so that it can still be
pulled into Juniper. That will allow us to drop support in time for the
Koa Named Release, while still providing community operators with a full
Named Release cycle to handle deprecation on their installations.

References:
- [0] TNL-7097
 2020-06-30 12:26:53 -07:00
atesker
d70303a893 EDUCATOR-5127 - update message 2020-06-30 11:55:21 -04:00
M. Zulqarnain
061faba726 unpin sailthru-client and django-cookies samesite (#24358) 2020-06-30 20:26:58 +05:00
edx-pipeline-bot
a678f43e37 Merge pull request #24363 from edx/private_to_public_cb8556b 
Mergeback PR from private to public.
 2020-06-30 20:18:20 +05:00
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