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

47140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uzair Rasheed
8d34268948 Merge pull request #18748 from edx/LEARNER-5931/update-learner-verification-emails 
Update verification status emails
 2018-08-16 19:25:25 +05:00
Jeremy Bowman
509e0fdf45 Merge pull request #18794 from edx/jmbowman/delete_flaky_test 
Delete flaky test due for removal anyway
 2018-08-16 09:29:39 -04:00
uzairr
af81113acf Update verification status emails 
Previously Verfication status emails are sent using sail-thru.Now,
Separate templates are added in the platform that will be used to
sent status emails to the learners.

LEARNER-5931
 2018-08-16 17:50:41 +05:00
mduboseedx
6bc8b4dcfa Merge pull request #18344 from open-craft/symbolist/navigation-for-anonymous-users 
Fixes for courseware anonymous access.
 2018-08-16 08:44:00 -04:00
Attiya Ishaque
5a4c457d15 Merge pull request #18786 from edx/ai/EDUCATOR-3327-drop-down-hidden 
Fix reporting drop down menu on data-download instructor dashboard.
 2018-08-16 17:32:33 +05:00
Jeremy Bowman
e6ee4e6940 Delete flaky test due for removal anyway 2018-08-16 08:08:56 -04:00
Uzair Rasheed
bb533c96fb Merge pull request #18770 from edx/LEARNER-3325/cert-generation-message 
Certificate messages must be dependent on active web configurations
 2018-08-16 16:05:50 +05:00
uzairr
a1a9e8e140 Certificate messages must be dependent on active web configurations 
Progress page is showing certificate messages for those courses in
which certificates are not offered.To avoid it,a check is added on
the existence of active course configuration so that it should be
displayed only for courses offering certificates.

LEARNER-3325
 2018-08-16 15:19:57 +05:00
Jeremy Bowman
098af33faa Merge pull request #18793 from edx/jmbowman/fix_xfail 
Fix sudden breakage of expectedFail
 2018-08-16 00:28:43 -04:00
Jeremy Bowman
3929536612 Fix sudden breakage of expectedFail 2018-08-15 21:57:25 -04:00
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
attiyaishaque
f9b5e6f3fd Fix reporting drop down menu on data-download instructor dashboard. 2018-08-15 15:40:27 +05: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