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

52381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
1aa80b2d8c Merge pull request #22361 from edx/diana/move-register-validation 
Move RegistrationValidationView into user_authn.
 2019-11-20 14:43:01 -05:00
Diana Huang
898bd8a90e Move RegistrationValidationView into user_authn. 2019-11-20 14:09:20 -05:00
Feanil Patel
255a14d243 Merge pull request #22359 from edx/jenkins/upgrade-python-requirements-1abad23 
Python Requirements Update
 2019-11-20 13:37:15 -05:00
Manjinder Singh
80dd243bdb Removing flaky test (#22362) 2019-11-20 13:33:39 -05:00
Adam Stankiewicz
6a443643c2 Merge pull request #22363 from edx/astankiewicz/version-bump-edx-enterprise 
version bump edx-enterprise to 2.0.23
 2019-11-20 13:20:56 -05:00
Adam Stankiewicz
d51e8557cd version bump edx-enterprise to 2.0.23 2019-11-20 11:25:59 -05:00
jinder1s
934543e7a5 Removing flaky test 2019-11-20 10:41:56 -05:00
Diana Huang
44a70ff8cc Merge pull request #22354 from edx/diana/move-generate-password 
Move generate_password to user_authn.
 2019-11-20 09:35:08 -05:00
Muhammad Ammar
a1e288a42e Merge pull request #22296 from edx/ammar/ent-2461-force-edx-org-users-to-login-through-google 
force @edx.org users to login through their google account
 2019-11-20 16:58:00 +05:00
muhammad-ammar
36697dab8c If user belongs to edx.org and does not exist in AllowedAuthEdxUser 
then user must login through `edx.org` Google account

ENT-2461
 2019-11-20 16:05:34 +05:00
edX requirements bot
c5f75838b8 Updating Python Requirements 2019-11-20 05:49:50 -05:00
Diana Huang
a538843ac3 Move generate_password to user_authn. 2019-11-19 16:49:36 -05:00
Nimisha Asthagiri
1abad23d4a User API: Remove unneeded create_account API (#22239) 
DEPR-52
 2019-11-19 15:45:26 -05:00
edx-pipeline-bot
3248fdb113 Merge pull request #22355 from edx/release-mergeback-to-master 
Merge release back to master
 2019-11-19 15:28:32 -05:00
Matt Hughes
1284b7ca19 Fix lint errors and address review comments 2019-11-19 15:06:03 -05:00
Matt Hughes
1185d3dd9c lint fixes 2019-11-19 15:06:03 -05:00
Matt Hughes
66b970c11d Count duplicates 2019-11-19 15:06:03 -05:00
Matt Hughes
ce28ccb497 fix for python 3 2019-11-19 15:06:03 -05:00
Matt Hughes
8299e0e727 Add test of multiple folks in the upload 2019-11-19 15:06:03 -05:00
Matt Hughes
9a6664cc05 Add unit tests for some corner cases 2019-11-19 15:06:03 -05:00
Matt Hughes
fe4a2d0c4f Moved to taking a file rather than long blob-of-text argument 2019-11-19 15:06:03 -05:00
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
Feanil Patel
b39382ad5c Merge pull request #22347 from edx/feanil/update_proctortrack 
Update proctortrack to fix a bug in json loading in python 3.
 2019-11-18 11:55:54 -05:00
Feanil Patel
e6c40cf647 Update proctortrack to fix a bug in json loading in python 3. 
https://github.com/edx/edx-proctoring/pull/622
 2019-11-18 11:41:44 -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