Commit Graph

47128 Commits

Author SHA1 Message Date
Jeremy Bowman
c6553822e7 Merge pull request #18791 from edx/jmbowman/TE-2702
TE-2702 Update Read the Docs links to HTTPS
2018-08-15 19:51:37 -04:00
Jeremy Bowman
713d64e1e2 TE-2702 Update Read the Docs links to HTTPS 2018-08-15 17:34:01 -04:00
Jeremy Bowman
10242d9dbf Merge pull request #18784 from edx/jmbowman/TE-2689
TE-2689 Remove useless pylint suppressions part 2
2018-08-15 14:55:45 -04:00
mduboseedx
a9b2814ac0 Merge pull request #18785 from jolyonb/jolyonb/fix_textline_css
Fixing textline CSS issue
2018-08-15 14:09:13 -04:00
Brian Mesick
5e5b50e4c1 Merge pull request #18783 from edx/bmedx/fix_sandbox_user_create
Fix failures due to creating users during initial migrations
2018-08-15 12:01:01 -04:00
Brian Mesick
de00636703 Merge pull request #18749 from edx/bmedx/PLAT-2278_upgrade_user_util
Upgrade user-util to 0.1.5
2018-08-15 11:59:45 -04:00
bmedx
f207fabfc4 Upgrade user-util to 0.1.5 2018-08-15 10:40:53 -04:00
Jolyon Bloomfield
9673db692d Fixing textline CSS issue 2018-08-14 20:40:51 -04:00
Jeremy Bowman
1a5bf35357 TE-2689 Remove useless pylint suppressions part 2 2018-08-14 17:39:02 -04:00
Jeremy Bowman
de7e2e18b7 Merge pull request #18776 from edx/jmbowman/TE-2526
TE-2526 Remove dependency on needle and nose
2018-08-14 16:31:45 -04:00
Matthew Piatetsky
ed40956317 Merge pull request #18779 from edx/update_mobile_exclusion
update mobile exclusion
2018-08-14 15:07:21 -04:00
Jeremy Bowman
38d74679e9 Merge pull request #18782 from edx/jmbowman/TE-2689
TE-2689 Remove useless pylint suppressions part 1
2018-08-14 15:04:42 -04:00
bmedx
c17a5d5eae Fix failures due to creating users during initial migrations 2018-08-14 14:21:42 -04:00
Matthew Piatetsky
e756d002cf update mobile exclusion 2018-08-14 14:07:56 -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
Jeremy Bowman
d671c4b1d0 TE-2689 Remove useless pylint suppressions part 1 2018-08-13 17:01:21 -04:00
Jeremy Bowman
fda571fedb TE-2526 Remove dependency on needle and nose 2018-08-13 16:21:47 -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