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

47113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bmedx
c17a5d5eae Fix failures due to creating users during initial migrations 2018-08-14 14:21:42 -04:00
Calen Pennington
13a54b7046 Merge pull request #18750 from edx/cale/fix-educator-3262 
Render all parts of XBlock fragments in a Conditional Module
 2018-08-14 10:53:00 -04:00
Dillon-Dumesnil
70cd65d411 Merge pull request #18775 from edx/bderusha/pni-records 
Fixing constant and added in tests
 2018-08-14 09:45:44 -04:00
Dillon Dumesnil
258cd3fe06 Fixing constant and adding in tests 2018-08-13 17:27:49 -04:00
Calen Pennington
19ba450b1d Merge pull request #18778 from cpennington/cale/fix-experiment-metadata 
Pass a CourseKey to has_staff_access_to_preview_mode, rather than a C…
 2018-08-13 16:13:19 -04:00
Michael Youngstrom
916031f5ba Merge pull request #18780 from edx/youngstrom/nodeenv-debug 
Bump up node install timeout and add verbose
 2018-08-13 16:08:23 -04:00
Calen Pennington
9edb6d9526 Pass a CourseKey to has_staff_access_to_preview_mode, rather than a CourseDescriptor 2018-08-13 15:44:06 -04:00
Michael Youngstrom
b72d136d8c Bump up node install timeout and add verbose 2018-08-13 15:35:28 -04:00
Jeremy Bowman
bcf60aea5b Merge pull request #18777 from edx/jeskew/fix_for_failing_unit_tests 
Use updated name of test helper method to fix unit tests.
 2018-08-13 15:33:16 -04:00
John Eskew
f0379517bc Use updated name of test helper method to fix unit tests. 2018-08-13 14:41:23 -04:00
Michael Youngstrom
086affe1d5 Merge pull request #18771 from edx/youngstrom/fix-xdist-test-errors 
Fix commonlib-unit test collection errors in xdist
 2018-08-13 14:01:31 -04:00
Michael Youngstrom
c58aac352c Fix commonlib-unit test collection errors 2018-08-13 12:40:53 -04:00
Brian Mesick
4afad3db77 Merge pull request #18747 from edx/bmedx/PLAT-2278_retirement_case_differences 
Stop username re-use, update retirement for multiple UserRetirementStatuses
 2018-08-13 12:40:26 -04:00
Brian Mesick
efa8b2afd0 Merge pull request #18764 from edx/bmedx/PLAT-2277_rehash_usernames_cmd 
Bulk rehashing of retired usernames
 2018-08-13 12:19:33 -04:00
Robert Raposa
b48af348d5 Merge pull request #18725 from edx/robrap/ARCH-193-update-edx-platform 
ARCH-193: Add metrics for requests.
 2018-08-13 11:19:11 -04:00
bmedx
2d71697823 Stop acct creation from using usernames still in the retirement queue 2018-08-13 11:13:21 -04:00
Robert Raposa
204eac003d Add metrics for requests. 
ARCH-193
 2018-08-13 10:00:57 -04:00
bmedx
8c93e424c0 Add forums renaming to bulk username rehash command 2018-08-10 16:55:45 -04:00
mduboseedx
48bcea342b Merge pull request #18772 from edx/mduboseedx/upgrade_reportlab 
upgrade reportlab and pillow
 2018-08-10 15:48:10 -04:00
Calen Pennington
44d612bae5 Fix unrelated pylint errors that cropped up 2018-08-10 13:32:55 -04:00
Calen Pennington
0aeec133fc Render all parts of XBlock fragments in a Conditional Module 
[EDUCATOR-3262]
 2018-08-10 13:32:55 -04:00
Matthew DuBose
4ec9831014 upgrade reportlab and pillow 2018-08-10 12:55:55 -04:00
Michael Youngstrom
e2331d7bb2 Merge pull request #18649 from edx/youngstrom/jenkins-pipeline-xdist 
Switch Jenkinsfile to use pytest-xdist
 2018-08-10 12:26:16 -04:00
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
bmedx
acadd057d9 Bulk rehashing of retired usernames 2018-08-09 15:35:38 -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
bmedx
c4ee7dacbc Update retirement to handle multiple UserRetirementStatus rows returned 2018-08-09 15:08:33 -04: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