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

52337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais Jibran
0ddcfee673 Merge pull request #22302 from edx/ai/bug/html-editor-codemirror-update 
Updating CodeMirror to 5.49.2
 2019-11-15 10:52:16 +05:00
Ned Batchelder
9828b2b7d2 Merge pull request #20186 from open-craft/josuebc/upstream/BB-755 
BB-755 Check if username is already unicode.
 2019-11-14 20:36:05 -05:00
Manjinder Singh
d6bfa03993 Removing flaky tests (#22328) 
These tests fail intermittently. The related jira ticket to remove flaky test can be found at: https://openedx.atlassian.net/browse/ENT-2479

The tests fail with error log output of: SafeCookieData BWC parse error: 'm3i1v99yuohzsbyjhfp4i9nktjrq4i05'
The error seems to be something to do with safe_cookie_string
 2019-11-14 16:29:51 -05:00
Matt Tuchfarber
889311a96a Merge pull request #22329 from edx/tuchfarber/add_course_enrollment_modes_to_cms 
Add manual enrollment role choices to CMS
 2019-11-14 14:00:16 -05:00
Agrendalath
3d59a7a5a7 Add result checks to test_unicode_username 2019-11-14 19:47:49 +01:00
Ned Batchelder
1d6db9bccb Merge pull request #22271 from eduNEXT/lmm/coursemodeladmin 
Improve load times of Django Admin - CourseMode
 2019-11-14 11:57:36 -05:00
Matt Tuchfarber
59ac1b009a Add manual enrollment role choices to CMS 
Required these be added to CMS since enterprise is installed in the CMS
and there are import failures when these keys don't exist
 2019-11-14 11:42:37 -05:00
Syed Muhammad Dawoud Sheraz Ali
a2f71eb5ea Merge pull request #22326 from edx/dsheraz/PROD-986 
remove unnecessary logs
 2019-11-14 17:18:02 +05:00
DawoudSheraz
2ac5fa160c remove unnecessary logs 2019-11-14 16:33:07 +05:00
Waheed Ahmed
ebaff94ceb Merge pull request #22319 from edx/geoip2-bot-update-country-database2019-11-13 
geoip2: update maxmind geolite country database
 2019-11-14 15:39:09 +05:00
edX Transifex Bot
d06c15da0e geoip2: update maxmind geolite country database 2019-11-13 20:33:22 +00:00
Matthew Piatetsky
4b4d6c963d Merge pull request #22285 from edx/REV-1008 
remove discount banner from track selection
 2019-11-13 13:32:08 -05:00
Awais Jibran
febf0ca7c2 Updating CodeMirror to 5.49.2. 2019-11-13 22:50:05 +05:00
Agrendalath
de7b8d4216 Fix tests 2019-11-13 18:33:33 +01:00
Agrendalath
a60efa2941 Make tests more static 2019-11-13 18:33:33 +01:00
Agrendalath
9449b50da6 Refactor after the review, add test 2019-11-13 18:33:33 +01:00
Josue Balandrano Coronel
f03081d04f Check if username is already unicode. 2019-11-13 18:32:55 +01:00
Luis Moreno
b514c9d8d1 Change courses field from select to input 2019-11-13 13:19:12 -04:00
Matt Tuchfarber
ec79aeca44 Merge pull request #22272 from edx/tuchfarber/manual_enrollment_app_api 
Add an manual enrollment audit creation API
 2019-11-13 11:15:57 -05:00
Matt Tuchfarber
a7ed319d58 Add an manual enrollment audit creation API 
Creates an API for other apps to be able to create manual enrollment
audit items. Follows the standards set forth in
docs/decisions/0002-inter-app-apis.rst
 2019-11-13 10:40:03 -05:00
Awais Jibran
fd813b5c8e Merge pull request #22298 from edx/aj/fix-user-partation-bug 
Fixes Course Grade Report.
 2019-11-13 15:58:58 +05:00
Awais Jibran
7af036275b Merge pull request #22299 from edx/aj/handle-valueerror 
Handle `ValueError` while getting group for user.
 2019-11-13 15:58:34 +05:00
Awais Jibran
aafaa1efae Handle ValueError while getting group for user. 2019-11-13 15:17:44 +05:00
Awais Jibran
b2805a92e6 Fixes Course Grade Report. 
This PR implements a waffle flag for generating course grade report only for verified learners.
 2019-11-13 15:14:02 +05:00
Waheed Ahmed
2fee476dc9 Merge pull request #22313 from edx/transifex-bot-update-translations2019-11-13 
fix(i18n): update translations
 2019-11-13 14:58:40 +05:00
Awais Qureshi
74af4dad63 Merge pull request #22312 from edx/awais786/BOM-1022 
BOM-1022
 2019-11-13 14:55:41 +05:00
edX Transifex Bot
b72ab40bae fix(i18n): update translations 2019-11-13 08:14:28 +00:00
Ayub
1cdfa5c7b2 Merge pull request #22311 from edx/BOM-1014 
-web-fragments version bump
 2019-11-13 13:02:25 +05:00
Awais Qureshi
fa18621db2 BOM-1022 
Bump the version for edx-completion
 2019-11-13 12:48:30 +05:00
Ayub khan
799cdb9e85 -web-fragments version bump 2019-11-13 11:07:00 +05:00
Brian Mesick
188056b752 Merge pull request #22308 from edx/bmedx/remove_proctoring_from_pii_safelist 
edx-proctoring now has real OEP-30 annotations, remove from safelist
 2019-11-12 18:06:02 -05:00
Robert Raposa
ddc34bd023 upgrade edx-drf-extensions to 2.4.5 (#22269) 
- Upgrade edx-drf-extensions to 2.4.5
- Removed constraint to 2.4.0, because 2.4.2 introduces a workaround for
ARCH-1210 by putting the problematic code behind a django setting.
- Remove unused JWT_AUTH_REFRESH_COOKIE setting.

ARCH-418, ARCH-1269, ARCH-1044

fix broken toggle
 2019-11-12 15:10:28 -05:00
Brian Mesick
4293d48bd4 edx-proctoring now has real OEP-30 annotations, remove from safelist 2019-11-12 14:10:22 -05:00
Nimisha Asthagiri
239d3bbfec Merge pull request #22306 from edx/arch/fix-reg-for-mobile 
Registration API: Remove success field when not succeeded
 2019-11-12 14:02:17 -05:00
Matthew Piatetsky
b0c9662b51 remove discount banner from track selection 2019-11-12 13:28:27 -05:00
Simon Chen
c5f03adb0e Add the organization protected attribute to team 
This is needed so Masters learners will not be in the same team as verfied and audit learners. If the team is designated as organization protected, it will not be visible or accessible by verified or audit track learners
MST-34
 2019-11-12 13:03:55 -05:00
Nimisha Asthagiri
f7be885719 Registration API: Remove success field 
LEARNER-7476
 2019-11-12 11:34:57 -05:00
irfanuddinahmad
0385d42d26 Merge pull request #22213 from edx/iahmad/ENT-2339-Updated-login-flow-for-customers-with-multiple-enterprises 
ENT-2339 Updated login flow for multiple enterprise
 2019-11-12 20:30:38 +05:00
Feanil Patel
b405c20139 Merge pull request #22256 from edx/feanil/fix_py3_quality 
Fix pep 8 violations.
 2019-11-12 09:59:18 -05:00
irfanuddinahmad
8b5e8968ed updated the login flow for multiple enterprise 2019-11-12 19:47:02 +05:00
edX requirements bot
8d77623d23 Updating Python Requirements (#22303) 2019-11-12 09:19:17 -05:00
Zia Fazal
75031d765d Merge pull request #22297 from edx/ziafazal/ENT-1849 
ENT-1849: Added caller info to the exception message
 2019-11-12 15:38:59 +05:00
Saad Yousaf
0425502244 Merge pull request #22195 from edx/saad/PROD-652 
Studio export/import can introduce extra spaces into text formatted as code
 2019-11-12 15:34:30 +05:00
DawoudSheraz
e306bc74c0 avoid pretty printing of pre tags in course import 2019-11-12 13:57:25 +05:00
Awais Qureshi
605d4a35df Merge pull request #22294 from edx/awais786/gunicorn-fix 
BOM-1027
 2019-11-12 12:02:52 +05:00
Awais Qureshi
f8b1ff538e BOM-1027 
guincorn just released its version on 9th-nov-2019 (20.0.0)
and it requires Python 3.x >= 3.4.
so adding constraint < 20.0.0

execute make upgrade
 2019-11-12 11:09:25 +05:00
Zia Fazal
5b6e0514de Added caller in to the exception message 
Added caller in to the exception message to debug ENT-1849
Replaced `get_enterprise_learner_data` method call with `enterprise_customer_for_request` to get enterprise customer data from cache or session instead of hitting API.
 2019-11-11 19:44:24 +05:00
Zainab Amir
b845fae0bc Remove logs (#22293) 
Revert logs added to investigate audit cert cutoff date

PROD-978
 2019-11-11 15:03:02 +05:00
Syed Muhammad Dawoud Sheraz Ali
89cd932108 Merge pull request #22276 from edx/dsheraz/PROD-976 
remove small job queue condition for bulk email task
 2019-11-11 12:25:04 +05:00
DawoudSheraz
50fe851614 remove small job queue condition for bulk email task 2019-11-11 11:46:16 +05:00