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

52417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Piatetsky
6d2ed9d876 Merge pull request #22389 from edx/try_to_fix_remove_discount_from_track_selection 
never give users discount unless they've seen the banner
 2019-11-22 16:31:39 -05:00
Matthew Piatetsky
51ea129267 never give users discount unless they've seen the banner 2019-11-22 15:54:59 -05:00
Awais Qureshi
7000b29d9a Merge pull request #22383 from edx/awais786/edx-when-upgrade 
BOM-1015.
 2019-11-22 21:35:30 +05:00
edX cache uploader bot
4330c0faae Updating Bokchoy testing database cache (#22382) 2019-11-22 11:31:28 -05:00
Ned Batchelder
7616fbed28 Merge pull request #22378 from edx/nedbat/update-coverage-plugin 
Update coverage versions for who-tests-what hacking
 2019-11-22 11:17:03 -05:00
Calen Pennington
89ef247f5d Merge pull request #22368 from luismorenolopera/dmo/INCR-561 
Convert @require_certificate_permission to use user.has_perm
 2019-11-22 11:06:05 -05:00
adeelehsan
d506ecc99f Merge pull request #22318 from edx/aehsan/prod-987/fixing_oom_issue_for_notify_credentials 
Fixing notify credentials job
 2019-11-22 20:54:56 +05:00
Zaman Afzal
9b82185323 Revert "ENT-2454 Modify third party auth pipeline to update user enterprise (#22314)" (#22384) 
This reverts commit 439e4b4169.
 2019-11-22 20:46:36 +05:00
Feanil Patel
bb75d2fffe Merge pull request #22381 from edx/jenkins/upgrade-python-requirements-df35dfd 
Python Requirements Update
 2019-11-22 09:57:25 -05:00
Diana Huang
685260c721 Merge pull request #22366 from edx/diana/move-password-change-request 
Move request_password_change to user_authn.
 2019-11-22 09:40:13 -05:00
adeelehsan
e32e39e099 Fixing notify credentials job 
To save the memory get cert and grade object directly from
the db because by doing that we'll override the queryset
evaluation and object won't be cached once it has gone out
of scope.

PROD-987
 2019-11-22 18:38:00 +05:00
Awais Qureshi
9cad9e4101 BOM-1015. 
Bump the version
 2019-11-22 18:36:40 +05:00
Zaman Afzal
439e4b4169 ENT-2454 Modify third party auth pipeline to update user enterprise (#22314) 
* ENT-2454 Modify third party auth pipeline to update user enterprise
 2019-11-22 17:47:12 +05:00
Abdul Hannan
f77461e749 Merge pull request #22372 from edx/rename_start_in_schedule__1/4 
Add start_date field in Schedule model to replace start as it's reserved keyword.
 2019-11-22 17:28:57 +05:00
hunytalk
75b4b04607 Add start_date field in schedule model 2019-11-22 16:46:57 +05:00
edX requirements bot
27580133fc Updating Python Requirements 2019-11-22 05:48:09 -05:00
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
Ned Batchelder
e10651f753 Update coverage versions for who-tests-what hacking 
The coverage version shouldn't matter, but why not use the latest?

The plugin version fixes an encoding issue.
 2019-11-21 14:53:01 -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
Diana Huang
d472cd8bfe Move request_password_change to user_authn. 2019-11-21 11:07:33 -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
David Moreno
5c2818d309 Convert @require_certificate_permission to use user.has_perm 2019-11-20 17:08:05 -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