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

52358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Hughes
474ce9bea6 Management command for rewriting social auth uids 
This management command will help us support migrating an SSO provider
from one configured user identifier to another, which may be necessary
when previous choices of UID aren't as stable as needed.

JIRA:EDUCATOR-4701
 2019-11-19 15:06:03 -05:00
Diana Huang
e78fa3c86f Merge pull request #22348 from edx/diana/move-get-login-session-form 
Move get_login_session_form to user_authn.
 2019-11-19 13:28:40 -05:00
Matthew Piatetsky
2d0c680277 Merge pull request #22353 from edx/revert-22330-stop_bucketing_discount 
Revert "[wip] stop bucketing into discount experiment a week before cyber monday"
 2019-11-19 12:44:04 -05:00
Matthew Piatetsky
c670688dcd Revert "[wip] stop bucketing into discount experiment a week before cyber monday" 2019-11-19 11:03:31 -05:00
Diana Huang
7cf13144ba Move get_login_session_form to user_authn. 2019-11-19 09:49:50 -05:00
irfanuddinahmad
d3d8660e15 Merge pull request #22346 from edx/iahmad/ENT-2346-Version-upgrade-for-edx-enterprise 
ENT-2346: Version upgrade for edx-enterprise
 2019-11-19 06:30:52 +05:00
irfanuddinahmad
af55780a31 Version upgrade for edx-enterprise 2019-11-18 20:45:56 +05:00
Nathan Sprenkle
994471c7ba Upgrade to edx-ora2 2.4.0 2019-11-18 09:56:22 -05:00
adeel khan
b985e41355 Merge pull request #22332 from edx/adeel/prod_733_fix_msg_financial_assistance 
Fixing error message for consistency
 2019-11-18 15:41:28 +05:00
Adeel Khan
6b04b57448 Fixing error message for consistency 
This patch would make financial
assistance form help message to be
consistent with implementation. Using
characters limit instead of word limit.

PROD-733
 2019-11-18 14:58:29 +05:00
edX Transifex Bot
d0f46ae89b fix(i18n): update translations 2019-11-17 16:24:15 -05:00
Matthew Piatetsky
13b6a7a110 Merge pull request #22330 from edx/stop_bucketing_discount 
stop bucketing into discount experiment a week before cyber monday
 2019-11-15 19:04:03 -05:00
edX cache uploader bot
a3e2858919 Updating Bokchoy testing database cache (#22334) 2019-11-15 12:25:50 -05:00
edX requirements bot
f98a017fcf Updating Python Requirements (#22335) 2019-11-15 11:35:00 -05:00
Matthew Piatetsky
7bed9b4d1f stop bucketing into discount experiment a week before cyber monday 2019-11-15 11:03:31 -05:00
Hasnain Naveed
3f007b8cad Merge pull request #22292 from edx/hasnain-naveed/ENT-2460 
ENT-2460 | Added a model for whitelist emails for authentication.
 2019-11-15 14:37:44 +05:00
Awais Jibran
27c6a28f77 Merge pull request #22316 from edx/aj/grade-report-code-refactor 
Code Refactor for Course Grade Report
 2019-11-15 14:22:53 +05:00
Awais Qureshi
f4f9d2948b Merge pull request #22325 from edx/awais786/BOM-1025-XBlock 
BOM-1025
 2019-11-15 12:32:33 +05:00
Awais Jibran
fb4b46c12c Code Refactor for Course Grade Report 2019-11-15 12:30:15 +05:00
hasnain-naveed
cda72e9071 ENT-2460 | Added a model for whitelist emails for authentication. 2019-11-15 11:56:44 +05:00
Awais Qureshi
3dfabd09d4 BOM-1025 
Bump the version for XBlock.
 2019-11-15 11:52:14 +05:00
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