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

47088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
b4fcbbd363 Switch Jenkinsfile over to xdist 2018-08-10 11:19:24 -04:00
Rabia Iftikhar
9ad0f2b838 Merge pull request #18769 from edx/ri/EDUCATOR-3030-remove-temperory-logs 
EDUCATOR-3030 remove temperory logs
 2018-08-10 12:32:44 +05:00
rabiaiftikhar
8286dcce88 EDUCATOR-3030 remove temperory logs 2018-08-10 10:46:29 +05:00
Feanil Patel
b3ff26a795 Merge pull request #18768 from edx/release-mergeback-to-master 
Merge release back to master
 2018-08-09 16:49:36 -04:00
Jeremy Bowman
2fb3805f56 Merge pull request #18739 from edx/jmbowman/TE-2525 
TE-2525 Finish removing nose.tools usage
 2018-08-09 15:56:28 -04:00
Simon Chen
c5347afd05 Merge pull request #18762 from edx/schen/revert_email_send 
Revert "Add feature to send an e-mail to staff when a student enrolls"
 2018-08-09 15:28:09 -04:00
Dillon-Dumesnil
8c5a0b4a38 Merge pull request #18759 from edx/bderusha/pni-records 
LEARNER-5989 Update eligible student record modes
 2018-08-09 15:27:45 -04:00
Rabia Iftikhar
7933b5125a Merge pull request #18654 from edx/ri/EDUCATOR-2120-allow-posts-community-ta 
EDUCATOR-2120 allow Community TA to see all discussion posts regardless of cohort and enrollment track
 2018-08-10 00:22:18 +05:00
Matt Drayer
2ff9bc66ec Merge pull request #18767 from edx/mattdrayer/ENT-1149 
mattdrayer/ENT-1149: Bump edx-enterprise to 0.72.5
 2018-08-09 15:00:36 -04:00
Bill DeRusha
4d07c9693b LEARNER-5989 Update eligible student record modes 
Include no-id-professional as an interesting mode to credentials
 2018-08-09 13:13:48 -04:00
Matt Drayer
59b22d5b62 mattdrayer/ENT-1149: Bump edx-enterprise to 0.72.5 2018-08-09 12:57:40 -04:00
Cole Rogers
eef63fdd81 Merge pull request #18756 from edx/colelrogers/LEARNER-6075-pathway-caching-pages 
Fix pathway caching to work with multiple pages returned from endpoint
 2018-08-09 11:11:03 -04:00
Feanil Patel
2a4c3ea831 Merge pull request #18766 from edx/feanil/further_downgrade_gunicorn 
Further downgrade gunicorn.
 2018-08-09 11:06:25 -04:00
Feanil Patel
b90a9c1735 Further downgrade gunicorn. 
18.0 seems to be doing a different thing with REMOTE_ADDR.

Putting this back to the last working version in production.
 2018-08-09 11:04:05 -04:00
Agha Awais
187d488059 Merge pull request #18753 from edx/awais/fix_grading_flaky_test 
fixed flaky test from grading
 2018-08-09 19:49:05 +05:00
mduboseedx
bf5aac7a14 Merge pull request #17477 from open-craft/ciuin/improve-courseenrollment-admin-search-upstream 
Improve CourseEnrollment admin search presentation
 2018-08-09 10:33:30 -04:00
rabiaiftikhar
1f34924573 EDUCATOR-2120 allow Community TA to see all discussion posts regardless of cohort and enrollment track 2018-08-09 17:53:39 +05:00
Brian Beggs
d9bf8aeac2 Merge pull request #18761 from edx/feanil/downgrade_gunicorn 
Downgrade `gunicorn` and run `make upgrade`
 2018-08-08 20:00:16 -04:00
Brian Beggs
b834daa1bb Set user-util to 0.1.4 2018-08-08 17:52:50 -04:00
Simon Chen
951b1f8408 Revert "Add feature to send an e-mail to staff when a student enrolls" 
This reverts commit 370501d156.
 2018-08-08 16:35:40 -04:00
Feanil Patel
056488a97a Downgrade gunicorn and run make upgrade 
There is a breaking change in gunicorn 19 which changes
the behavior of the `REMOTE_ADDR` request meta info. It
no longer correctly passes through the value of X-Forwarded-For
if that header is present.

This resulted in making anything that looked at this attribute
think that all requests were coming from 127.0.0.1

This broke the django-ratelimit-backend library which relies on
this feature to determine if a user has had too many login attempts.
 2018-08-08 16:32:11 -04:00
adeel khan
e3b6cad173 Merge pull request #18742 from edx/adeel/learner_5865_register_page_incorrect_screenreader_error 
Fixes unnecessary error reporting by screen reader
 2018-08-09 01:06:09 +05:00
Dillon-Dumesnil
796500bdff Merge pull request #18757 from edx/ddumesnil/LEARNER-5098 
Removing student records waffle flag from LMS
 2018-08-08 15:44:34 -04:00
Dillon Dumesnil
f59eafa1c0 Removing student records waffle flag from LMS 2018-08-08 15:04:27 -04:00
Adeel Khan
85af79be25 Fixes unnecessary error reporting by screen reader 
This patch would inject error message dynamically for
screen readers only when there is an error state. In
normal flow screen reader would not be reporting any
errors to users.

LEARNER-5865
 2018-08-09 00:01:41 +05:00
Cole Rogers
11cd2ef557 Update pathway caching to work with multiple pages returned from endpoint 2018-08-08 14:35:41 -04:00
Kevin Falcone
834c2eb1b3 Merge pull request #18665 from edx/jibsheet/reset-db-cache 
Recreate caches because we rolled back a migration that was added
 2018-08-08 13:57:04 -04:00
Awais Jibran
b1b473976c Merge pull request #18754 from edx/revert-18744-aj/add-more-logging-in-load_from_module_store 
Revert "Adding more logging"
 2018-08-08 22:42:31 +05:00
Awais Jibran
316fdd67c2 Revert "Adding more logging" 2018-08-08 21:45:45 +05:00
Agha Awais
556a88e5fa fixed flaky test from grading 2018-08-08 16:19:05 +00:00
Brittney Exline
017691de50 Merge pull request #18751 from edx/bexline/enterprise_version_bump 
ENT-1135 Upgrade edx-enterprise to 0.72.4
 2018-08-08 09:59:50 -06:00
Troy Sankey
22a565ffa7 Merge pull request #18740 from edx/pwnage101/add-partner-reporting-model-admin 
Add ModelAdmin for UserRetirementPartnerReportingStatus
 2018-08-08 11:42:46 -04:00
Brittney Exline
525ffb5c76 ENT-1135 Upgrade edx-enterprise to 0.72.4 2018-08-08 11:25:59 -04:00
Troy Sankey
a1e2cccb3d Add ModelAdmin for UserRetirementPartnerReportingStatus 
Primarily, this was added for convenient bulk moving of processing
states from True to False without having to incur the round-trip
duration of a devops support ticket (in which they run SQL on our
behalf).
 2018-08-08 11:09:31 -04:00
Qubad786
b961569d35 Fix integrity errors 2018-08-08 19:42:21 +05:00
Feanil Patel
b26bb7f98e Merge pull request #18743 from edx/feanil/upgrade_gunicorn 
Move pin of `gunicorn` to 2015 and run `make upgrade`
 2018-08-08 09:10:16 -04:00
Awais Jibran
0d4a9a9e51 Merge pull request #18744 from edx/aj/add-more-logging-in-load_from_module_store 
Adding more logging
 2018-08-08 16:13:09 +05:00
Awais Jibran
e38957bdb0 Adding more logging 2018-08-08 11:54:02 +05:00
Noraiz Anwar
4dc4fa935a Merge pull request #18737 from edx/noraiz/EDUCATOR-3296 
exempt pdf view from xframe_options:deny
 2018-08-08 11:46:17 +05:00
Jeremy Bowman
17f54fbaff TE-2525 Finish removing nose.tools usage 2018-08-07 21:39:02 -04:00
Matthew Piatetsky
4c93abda09 Merge pull request #18734 from edx/add_mobile_exclusion_for_vop_and_cgv3 
add course level mobile app exclusion for vop and cgv3 experiments
 2018-08-07 19:35:07 -04:00
Feanil Patel
26e7c82c5f Move pin of gunicorn to 2015 and run make upgrade 
Gunicorn Change Log: http://docs.gunicorn.org/en/stable/2015-news.html
 2018-08-07 18:03:07 -04:00
Matthew Piatetsky
cfa4dc6945 add course level mobile app exclusion for vop and cgv3 experiments 2018-08-07 17:19:55 -04:00
Michael Roytman
df9e6c6fc9 Merge pull request #18741 from edx/mroytman/bump-studio-frontend-1.16.5 
bump studio-frontend package to 1.16.5
 2018-08-07 16:49:49 -04:00
Douglas Hall
65d9d5411e Merge pull request #18732 from edx/douglashall/upgrade_drf_extensions 
Upgrade edx-drf-extensions to 1.6.1.
 2018-08-07 16:05:50 -04:00
Michael Roytman
46cda3656b bump studio-frontend package to 1.16.5 2018-08-07 15:47:34 -04:00
Douglas Hall
6e9d71f44c Upgrade edx-drf-extensions to 1.6.1. 2018-08-07 15:19:20 -04:00
Jeremy Bowman
02e4b87421 Merge pull request #18733 from edx/jmbowman/TE-2525 
TE-2525 nose.tools removal part 1/2
 2018-08-07 13:55:04 -04:00
J Eskew
6ee6e8935b Merge pull request #18711 from edx/jeskew/mgmt_cmd_cancel_user_retirement 
Mgmt command to cancel user retirement request.
 2018-08-07 12:03:11 -04:00
Jeremy Bowman
4b13ad577b Merge pull request #18731 from edx/jmbowman/TE-2524 
TE-2524 Remove remaining nose.plugins usage
 2018-08-07 10:34:54 -04:00