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

52398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert (AJ) St. Aubin
df35dfd94c Merge pull request #22374 from edx/aj/ENT-2082_url 
Upgrade edx-enterprise to 2.0.24
 2019-11-21 14:55:45 -05:00
Calen Pennington
5168904b8a Merge pull request #22377 from cpennington/fix-bok-choy-wtw-collection 
Remove the SHARD suffix for bokchoy coverage reports, because they ar…
 2019-11-21 14:10:56 -05:00
Calen Pennington
f4739209fa Remove the SHARD suffix for bokchoy coverage reports, because they are collected in parallel mode 2019-11-21 13:33:31 -05:00
Dave St.Germain
f67307cdfc Merge pull request #22371 from edx/dcs/nav-missing-course 
Prevent 500 error when viewing malformed unit page
 2019-11-21 13:02:02 -05:00
Alan Zarembok
efd225ce8e Merge pull request #22375 from edx/azarembok/notes-devstack-fixes 
Updates notes client name and API url for compatiblity with devstack.
 2019-11-21 11:50:21 -05:00
Jeremy Bowman
052f853ec1 Fix Jenkins virtualenv cleanup (#22356) 2019-11-21 11:05:05 -05:00
Alan Zarembok
38491776f0 Updates notes client name and API url for compatiblity with devstack. 2019-11-21 10:54:19 -05:00
Albert (AJ) St. Aubin
107d9b5200 Upgrade edx-enterprise to 2.0.24 2019-11-21 10:46:23 -05:00
Dave St.Germain
6642de5ce2 Prevent 500 error when viewing malformed unit page 
PROD-1026
 2019-11-21 09:51:30 -05:00
Syed Muhammad Dawoud Sheraz Ali
889daa8baf Merge pull request #22369 from edx/dsheraz/PROD-1026-logs 
log section and subsection information during URL retrieval failure
 2019-11-21 18:16:04 +05:00
Uzair Rasheed
38871fa613 Merge pull request #22323 from edx/resubmit-photos-button-must-appear 
Resubmit Photo-Verification button must appear in approval box.
 2019-11-21 17:35:46 +05:00
DawoudSheraz
94e83cdfb3 log section and subsection information during URL retrieval failure 2019-11-21 17:23:09 +05:00
uzairr
34134ff229 Resubmit Photo-Verification button must appear in approval box. 
Currently, Resubmit photo-verification button is not been displayed
inside the approval box on dashboard.In order to allow a learner to
resubmit before expire it must be displayed in it.
 2019-11-21 15:21:14 +05:00
Robert Raposa
a48ec5fdfd Merge pull request #22367 from edx/robrap/ARCH-1253-more-login-metrics 
ARCH-1253: add more temporary login custom metrics
 2019-11-20 17:41:56 -05:00
Robert Raposa
7a2594006d add more temporary login custom metrics 
- add login_user + third party auth (tpa) metrics

This is in service of ARCH-1253 clean-up of login.

ARCH-1253
 2019-11-20 16:56:56 -05:00
Robert Raposa
bf85380dc3 add temporary login custom metrics. (#22365) 
- add temporary custom metrics for shim_student_view.
- remove some pointless tests.

This is in service of ARCH-1253 clean-up of login.

ARCH-1253
 2019-11-20 16:36:04 -05:00
edX Transifex Bot
aeca7d9d97 geoip2: update maxmind geolite country database 2019-11-20 16:08:32 -05:00
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