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

39867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
e124c4a6a2 Print the paver output for python cyclomatic complexity to console. 
The actual report will continue to be piped into reports/python_complexity.log.

By exposing the paver output (approx 4 lines), we'll be able to consume
the actual complexity number in our logs and therefore trend the results
in our log aggregator.
 2017-01-25 07:45:34 -05:00
Simon Chen
28e3b1cb5a Merge pull request #14297 from edx/schen/ECOM-6760 
Add the Sailthru welcome email delay
 2017-01-11 14:52:31 -05:00
Sylvia Pearce
ec9560af48 Merge pull request #14303 from edx/sylvia/DOC-2167 
Update guidance in Studio Unit Location text
 2017-01-11 14:49:32 -05:00
Jesse Zoldak
ae4e384e17 Merge pull request #14310 from edx/revert-13914-proversity/feature-flag-for-library-creation 
Revert "Feature flag for library creation"
 2017-01-11 14:39:51 -05:00
Jesse Zoldak
ff43b823d8 Revert "Feature flag for library creation" 2017-01-11 14:35:19 -05:00
Braden MacDonald
58e3c7827a Merge pull request #13914 from proversity-org/proversity/feature-flag-for-library-creation 
Feature flag for library creation
 2017-01-11 10:56:25 -08:00
Marko Jevtić
eb60c65d0b Merge pull request #14223 from edx/douglashall/fix_staff_or_owner_api_permissions_check 
ECOM-6706 Check API View kwargs for username when checking for staff or owner permission
 2017-01-11 14:31:30 +01:00
Marko Jevtic
ba32bd0899 Fix test owner 2017-01-11 07:43:19 +00:00
Marko Jevtic
8e33ec52b5 Address comments 2017-01-11 07:09:48 +00:00
Douglas Hall
b44864b353 Check API View kwargs for username when checking for staff or owner permission 2017-01-11 07:09:48 +00:00
Nimisha Asthagiri
7849d2d92c Merge pull request #14277 from edx/beryl/grades-management-command 
Management command to Reset Grades
 2017-01-10 21:14:03 -05:00
Calen Pennington
c1759edd55 Merge pull request #14300 from edx/release 
Merge pull request #14296 from edx/cale/rc-merge-branch
 2017-01-10 16:38:18 -05:00
Sylvia Pearce
d6cf03b094 Update guidance in Studio Unit Location text 2017-01-10 16:29:08 -05:00
Nimisha Asthagiri
05087bfac2 Management command to Reset Grades 
TNL-6251
 2017-01-10 15:26:52 -05:00
Jeff LaJoie
62d129fdab Merge pull request #14298 from edx/jlajoie/TNL-6095 
Adds trailing_text id to input describedby
 2017-01-10 15:21:44 -05:00
Nimisha Asthagiri
adad6b2e83 Merge pull request #14293 from edx/beryl/pre-collect-grade-report 
Grade Report: Reuse collected block structure
 2017-01-10 13:44:24 -05:00
Calen Pennington
6e043d97c0 Merge pull request #14296 from edx/cale/rc-merge-branch 
Cale/rc merge branch
 2017-01-10 13:37:02 -05:00
Simon Chen
8309930bbf Add the email marketing welcome email delay ECOM-6760 2017-01-10 11:41:02 -05:00
Jesse Zoldak
4a5426a6a7 Merge pull request #14289 from edx/zoldak/no-celery-retry-for-bok-choy 
Do not retry block structures tasks on bok choy servers
 2017-01-10 11:16:20 -05:00
Anthony Mangano
2d85fe4ab2 Merge pull request #14279 from edx/ECOM-5936-send-course-id-and-enrollment-track-to-zendesk-custom-fields 
Ecom 5936 enable users to select course when making support requests
 2017-01-10 10:55:51 -05:00
Brian Jacobel
6572b1df70 Merge pull request #14280 from edx/bjacobel/disc-prof-no-read-state 
Hide read state on profile pages. Add tests for read state generally
 2017-01-10 10:54:39 -05:00
Jeff LaJoie
1c0a60ebc4 TNL-6095: adds trailing_text id and adds to describedby_html, updates tests 2017-01-10 10:27:59 -05:00
Brian Jacobel
f58076e726 Don't hijack existing context to do this 2017-01-10 10:00:23 -05:00
Brian Jacobel
30f62203e2 Hide read state on profile pages. Add tests for read state generally 2017-01-10 10:00:23 -05:00
Jesse Zoldak
c25e836128 Do not retry block structures tasks on bok choy servers 2017-01-10 09:53:15 -05:00
Jesse Zoldak
deb9e53942 Merge pull request #14295 from edx/zoldak/TE-1927 
Skip the youtube acceptance tests  TE-1927
 2017-01-10 09:27:48 -05:00
Clinton Blackburn
b14a8d6403 Updated factory-boy to 2.8.1 
ECOM-4422
 2017-01-10 09:20:05 -05:00
Jesse Zoldak
d87c9c412e Skip the youtube acceptance tests TE-1927 2017-01-10 08:21:15 -05:00
noraiz-anwar
b967538fee Merge pull request #14275 from edx/revert-14216-noraiz/TNL-6197 
Revert "Error while exporting course with too long filename"
 2017-01-10 16:01:55 +05:00
Nimisha Asthagiri
04d4ab0e4d Grade Report: Reuse collected block structure 2017-01-09 22:04:16 -05:00
Eric Fischer
2f9786caeb Merge pull request #14262 from edx/efischer/expand_except 
Retry on all exceptions on failed subsection grade update
 2017-01-09 13:51:10 -05:00
Calen Pennington
998205090f Merge pull request #14282 from edx/release 
Merge Release into Master
 2017-01-09 13:28:23 -05:00
Anthony Mangano
38d8017db4 more pylint fixes 2017-01-09 12:38:18 -05:00
Eric Fischer
3fd86614b0 sub_api get_score return value is a dict 
This access pattern was wrong, and was causing errors in production. I've
included an additional happy-path test.
 2017-01-09 11:50:18 -05:00
Eric Fischer
a7c2a3d926 Retry on all exceptions on failed subsection grade update 2017-01-09 11:50:18 -05:00
Anthony Mangano
8e1eafd1d4 test fix 2017-01-09 11:34:05 -05:00
Anthony Mangano
4de65abbaa pylint fixes 2017-01-09 11:33:04 -05:00
Ned Batchelder
7be0d67546 Merge pull request #14285 from edx/ned/2017 
Happy New Year
 2017-01-07 22:34:04 -05:00
Ned Batchelder
9ff91756e5 Happy New Year 2017-01-07 20:19:51 -05:00
Anthony Mangano
6296b0c968 clean up tests for feedback form view 2017-01-06 21:44:59 -05:00
Anthony Mangano
d3afb3c1c2 dont send blank course_ids to Zendesk or Datadog 2017-01-06 18:15:19 -05:00
Calen Pennington
35337582d8 Merge pull request #14281 from edx/release-candidate 
Merge Release candidate into Release
 2017-01-06 14:09:18 -05:00
Anthony Mangano
69ae314dd8 enable users to select course when making support requests 
ECOM-5936
 2017-01-06 13:34:13 -05:00
Jeff LaJoie
b8befaf756 Merge pull request #14278 from edx/jlajoie/TNL-6186 
Change CourseTeamMembership emit to use proper id
 2017-01-06 13:33:46 -05:00
Calen Pennington
80a7bfd58d Revert "Merge pull request #14273 from edx/feanil/test_with_system_firefox" 
This reverts commit 04f8769428, reversing
changes made to 4b196d421b.
 2017-01-06 11:28:05 -05:00
Christina Roberts
adc3c8f89c Merge pull request #14134 from edx/christina/jsinput-newtemplate 
New jsinput example problem
 2017-01-06 10:29:59 -05:00
Christina Roberts
7c7b4da79a Merge pull request #14269 from edx/christina/tnl-6041 
Remove flaky decorator from test_capa_module
 2017-01-06 09:47:31 -05:00
Jeff LaJoie
982d56ca24 added self to AUTHORS 2017-01-06 08:11:12 -05:00
Jeff LaJoie
d66e323d42 TNL-6186 changes field used in CourseTeamMembership emit to be correct team_id and fixes tests 2017-01-06 08:10:31 -05:00
Jesse Zoldak
2a6432dba4 Merge pull request #14188 from edx/zoldak/bok-choy-startup-time 
Give the bok choy server more time to start up
 2017-01-05 18:06:21 -05:00