Commit Graph

58450 Commits

Author SHA1 Message Date
Awais Qureshi
137fd0a96e Merge pull request #24126 from eduNEXT/eric/update-social-django-app-dep
[BD-6] Use Pypi release of social-app-django
2020-06-19 16:16:07 +05:00
M. Zulqarnain
db953d89a6 upgrade ora2 to install from PyPI (#24236) 2020-06-19 15:44:36 +05:00
Eric Herrera
249fcad94c Move social-app-django from github to base requirement, since PyPi version is now compatible with the platform. 2020-06-18 18:44:56 -05:00
stvn
b8e8187b91 Merge PR #24192 mfe/masquerade
* Commits:
  Update masquerade API to show only active partitions
  Add explicit masquerade support to courseware API
2020-06-18 15:41:08 -07:00
stvn
2f7372202b Update masquerade API to show only active partitions 2020-06-18 14:54:50 -07:00
stvn
994b2b002f Add explicit masquerade support to courseware API 2020-06-18 14:54:49 -07:00
stvn
a69855e9ad Merge PR #24245 cleanup/log.warn
* Commits:
  Replace references to 'log.warn' with 'log.warning'
2020-06-18 14:50:37 -07:00
Binod Pant
2c229481dc Result of running make upgrade in order to upgrade to edx-enterprise v3.3.5 (#24256)
all versions updates were minor and no visible downgrades
2020-06-18 16:59:19 -04:00
Daniel Francis
82c0ca0da8 Fixing implicit parser name for Beautiful Soup (lms, openedx) (#24100)
Fixing 56 GuessedAtParserWarnings, in commit edx#24098

Background: BeautifulSoup automatically picks the fastest parser available. By default, it picks the "lxml" parser.

Per the [BeautifulSoup](https://www.crummy.com/software/BeautifulSoup/bs4/doc/#installing-a-parser) documentation:

> Beautiful Soup supports the HTML parser included in Python’s standard library, but it also supports a number of third-party Python parsers. One is the lxml parser. Depending on your setup, you might install lxml with one of these commands.
> Another alternative is the pure-Python html5lib parser, which parses HTML the way a web browser does. 

Context: We changed two statements, one in lms and another in openedx. Both statements fire up BeautifulSoup. Now we explicitly ask for "lxml," following the recommendation on BeautifulSoup's documentation:

> If you can, I recommend you install and use lxml for speed. If you’re using a very old version of Python – earlier than 2.7.3 or 3.2.2 – it’s essential that you install lxml or html5lib. Python’s built-in HTML parser is just not very good in those old versions.

Before:
`soup = BeautifulSoup(content)`

After:
`soup = BeautifulSoup(markup=content, features="lxml")`

The warnings are gone, tests are passing in local.
2020-06-18 15:41:07 -04:00
Nathan Sprenkle
5cedc64f41 Correct team count for private team-sets in Teams tab (#24216)
* Hide private team-sets from users not on a team

* Modify add team count to factor in team visibility

* Fix bug that broke search w/in private team-sets
2020-06-18 15:21:58 -04:00
stvn
0ae91c0921 Replace references to 'log.warn' with 'log.warning'
to remove some `DeprecationWarning`s from the logs
as the former method as been deprecated since Python 3.3 [1][2].

- [1] https://github.com/python/cpython/blob/3.3/Lib/logging/__init__.py#L1252-L1253
- [2] https://stackoverflow.com/a/15655674
2020-06-18 12:08:15 -07:00
Michael Roytman
c51cc3705b Merge pull request #24250 from edx/mroytman/MST-223-bump-edx-proctoring-2.4.3
update version of edx-proctoring library
2020-06-18 15:02:45 -04:00
Nick
3c3431a482 Merge pull request #24252 from edx/ndalfonso/fix-dates-banner-translations
Fix Dates Banner Translations
2020-06-18 13:08:40 -04:00
Robert Raposa
a1572dafce add waffle_flag custom metric (#24244)
If setting ENABLE_WAFFLE_FLAG_METRIC is True, a custom
metric will be added with the values of all WaffleFlag
and CourseWaffleFlags seen during the transaction.

Metric flag values could be False, True, or Both.
The value Both would mean that the flag had both
a True and False value at different times through
the transaction. This is most likely due to having a
check_before_waffle_callback, as is the case with
CourseWaffleFlag.

Example metric value:

    "{'another.course.flag': 'False', 'some.flag': 'False', 'some.course.flag': 'Both'}"

Warning: NewRelic does not recommend large custom
metric values due to the potential performance
impact on the agent, so you may just want to
enable when researching usage of a particular flag.
Metric values longer than 255 are truncated.

TODO: A how_to can be added later if we find this
useful, including helpful querying tips.

ARCHBOM-132
2020-06-18 12:21:57 -04:00
Nicholas D'Alfonso
e0fecb47e4 Fix Dates Banner Translations
- replace unicode apostrophes with single quotes in dates banner.
- change language in button from 'Reset my deadlines' to 'Shift
  due dates'
2020-06-18 12:20:47 -04:00
Jansen Kantor
7e459c7228 EDUCATOR-5069: Display student key in csv export (#24235)
* use external_user_key in teams csv download
2020-06-18 12:13:06 -04:00
Michael Terry
d325943fe5 Merge pull request #24169 from edx/mikix/celebration
AA-137: Support courseware celebrations
2020-06-18 10:49:36 -04:00
atesker
12aba3bd94 PR comments 2020-06-18 10:31:24 -04:00
atesker
8bf47afdae Initial ADR draft - comments and move 2020-06-18 10:31:24 -04:00
atesker
992ca3174e Initial ADR draft 2020-06-18 10:31:24 -04:00
Michael Roytman
9ec1c3e6ca update version of edx-proctoring library 2020-06-18 09:50:23 -04:00
Adam Butterworth
c37f73c40e Merge pull request #24158 from eduNEXT/lmm/course_sock_standalone
[BD-10] Remove unused course sock URL.
2020-06-18 09:16:26 -04:00
Adam Butterworth
a024f56bb9 Merge pull request #24124 from eduNEXT/ama/DEPR-68/DEPR-84
[BD-10] [DEPR-68][DEPR-84] Remove pattern library of learner_dashboard/programs.py
2020-06-18 09:16:14 -04:00
Adam Butterworth
4ebe6a8458 Merge pull request #24111 from eduNEXT/ama/DEPR-79
[BD-10] [DEPR-79] Remove pattern library of mobile/course-dates-fragment.html
2020-06-18 09:15:43 -04:00
Adam Butterworth
1b60797c49 Merge pull request #24101 from eduNEXT/lmm/depr70
[BD-10] [DEPR-70] Remove waffle flag edx_discussions.use_bootstrap.
2020-06-18 09:15:32 -04:00
Adam Butterworth
98dd03a638 Merge pull request #24077 from eduNEXT/ama/DEPR-78/DEPR-82
[BD-10] [DEPR-78][DEPR-82] Remove pattern library of latest-update-fragment.html and welcome-message-fragment.html
2020-06-18 09:15:20 -04:00
Adam Butterworth
0768acbf40 Remove pattern library of course_experience/course-outline-fragment.html (#24044) 2020-06-18 09:14:38 -04:00
Aura Milena Alba
078dcc4296 Remove use pattern library of EdxFragmentView and discussion/maintenance_fragment. (#24029) 2020-06-18 09:10:18 -04:00
Awais Qureshi
975352b08a Merge pull request #24240 from eduNEXT/lmm/re_py38
[BD-6] Fix python 3.8 compatibility
2020-06-18 16:51:19 +05:00
Adeel Khan
f565c75d94 Fixes xss issues.
PROD-1532
PROD-1533
PROD-1577
PROD-1578
2020-06-18 15:09:55 +05:00
edx-pipeline-bot
47c0f3dee8 Merge pull request #24246 from edx/private_to_public_edd9b02
Mergeback PR from private to public.
2020-06-18 12:22:20 +05:00
Ali Akbar
edd9b02d52 Merge pull request #180 from edx/sustaining-xsslint-security-fixes
Sustaining xsslint security fixes
2020-06-18 11:32:39 +05:00
edX Transifex Bot
04b3a2ce1a geoip2: update maxmind geolite country database 2020-06-17 17:00:36 -04:00
Luis Moreno
398a8a2b23 Fix python 3.8 compatibility 2020-06-17 16:08:20 -04:00
morenol
41543edd93 Remove course_experience.use_bootstrap waffle flag (#24028)
[BD-10] [DEPR-83]
2020-06-17 13:26:51 -04:00
M. Zulqarnain
bc568309ec BOM-1701: Ran pyupgrade on pavelib (#24230) 2020-06-17 17:09:38 +05:00
Ahtisham Shahid
1743e0e590 Merge pull request #24228 from edx/ahtisham/PROD-1679
Removed confirm email after SSO
2020-06-17 12:25:26 +05:00
Michael Terry
450072582e AA-137: Support courseware celebrations
- Add a new CourseEnrollmentCelebration model, which ties a
  course enrollment to some booleans about progress celebrations
- Add serialization of the new model to the existing courseware_api
  app's existing course info view
- Add new API in courseware_api to update a celebration model
2020-06-16 15:19:21 -04:00
ericfab179
c8abbd2c0f Update transifex client to use PyPi release. (#24217)
Use transifex client from PyPi since required change was merged recently.
2020-06-16 13:56:31 -04:00
Alex Wang
931f0ae5f5 add username and email to getProgramEnrollment response (#24186)
MST-234
2020-06-16 11:57:23 -04:00
Ahtisham Shahid
340e00988f Removed confirm email after SSO 2020-06-16 14:06:52 +05:00
Saad Yousaf
25c23f446c Merge pull request #23959 from edx/saad/PROD-1230-sync-certificates
[PROD-1230] - syncing certificates on course update on credential side.
2020-06-16 12:43:03 +05:00
SaadYousaf
52cfe647b3 syncing certificates on course update on credential side. 2020-06-16 11:58:49 +05:00
Samuel Walladge
43f0cd72af Merge remote-tracking branch 'origin/master' into samuel/fix-unescaped-selector 2020-06-16 09:52:38 +09:30
Farhanah Sheets
4fc7dbd35e Merge pull request #24227 from edx/revert-24221-ora2-upgrade
Revert "BOM-1703 : Ora2 Upgrade"
2020-06-15 17:17:35 -04:00
Farhanah Sheets
6fedb15cc4 Revert "BOM-1703 : Ora2 Upgrade (#24221)"
This reverts commit f3161468a3.
2020-06-15 16:48:12 -04:00
Matt Tuchfarber
9423c2c4d6 Merge pull request #24224 from edx/revert-24210-tuchfarber/add_demographics_banner_to_theme
Revert "Add demographics prompt to edx.org theme"
2020-06-15 15:21:22 -04:00
Carla Duarte
8949ee96da Merge pull request #24193 from edx/ciduarte/AA-181
AA-181: Updating Outline Tab API to include Course Blocks
2020-06-15 15:15:53 -04:00
Nick
badf3281b3 Merge pull request #24122 from edx/ndalfonso/AA-133-mfe-dates-banner
AA-133 mfe dates banner
2020-06-15 15:08:02 -04:00
Matt Tuchfarber
7edac4e4b2 Revert "Add demographics prompt to edx.org theme" 2020-06-15 14:54:54 -04:00