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

39243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Lee
2da026996d Merge pull request #13938 from open-craft/hotfix/2016-11-08 
Updates problem-builder to v2.6.1
 2016-11-09 13:20:06 -05:00
Brian Beggs
55e4813f3a Upgrade Pillow CVE-2016-9190 CVE-2016-9189 2016-11-08 16:58:34 -05:00
Jillian Vogel
8d6243ff0f Updates problem-builder to v2.6.1, which fixes the instructor_task import errors. 
Ref https://github.com/open-craft/problem-builder/pull/128
 2016-11-08 10:45:01 +10:30
Toby Lawrence
183d741b9b Merge pull request #13934 from edx/bugfix/forums-enable-data-migration 
Provide a default configuration for forums if none already exists.
 2016-11-07 15:02:28 -05:00
Toby Lawrence
3969f0cad9 Provide a default configuration for forums if none already exists. 2016-11-07 14:02:17 -05:00
Kevin Falcone
9135000a7f Merge pull request #13929 from edx/jibsheet/revert-problem-builder 
Revert "Updates problem-builder version to use 2.6.0"
 2016-11-07 10:57:58 -05:00
Kevin Falcone
34ee0e050b Revert "Updates problem-builder version to use 2.6.0" 
https://openedx.atlassian.net/browse/TNL-5903

This reverts commit d6787cd13b.
This reverts commit 0016d1af4e.
 2016-11-07 10:31:15 -05:00
Adam
882b793334 Merge pull request #13921 from edx/adam/neo4j-skip-courses 
add ability to skip courses when dumping to neo4j
 2016-11-04 14:13:35 -04:00
Adam Palay
5b1d0fd3d9 add ability to skip courses when dumping to neo4j 2016-11-04 13:12:55 -04:00
Ben Patterson
d59ab18b27 Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil 
Revert "Implement DateUtils in LMS"
 2016-11-04 10:44:59 -04:00
Albert (AJ) St. Aubin
0ebab35e89 Merge pull request #13901 from edx/TNL-5281_labelUpdate 
Updates to correct a11y issues with CodeMirror
 2016-11-04 10:33:54 -04:00
Matthew Piatetsky
586c9480a8 Merge pull request #13896 from edx/ECOM-5769_enable_jwt 
ECOM-5769 Add JWT auth and hidden flag to course_api for retrieving hidden courses
 2016-11-04 10:26:57 -04:00
Eugeny Kolpakov
4c4c5a4db1 Merge pull request #13900 from open-craft/ekolpakov/SOL-2070 
Library creation test is not flaky anymore
 2016-11-04 17:25:51 +03:00
Cliff Dyer
f258e053b1 Merge pull request #13909 from edx/release 
Merge to master for patch/2016-11-03
 2016-11-04 09:34:41 -04:00
Albert St. Aubin
be0e0b8eec Updates to correct a11y issues with CodeMirror 
TNL-5281
 2016-11-04 09:25:15 -04:00
Jesse Zoldak
ec880138d2 Revert "Implement DateUtils in LMS" 2016-11-04 07:50:26 -04:00
E. Kolpakov
f6d69560f9 Library creation test is not flaky anymore 2016-11-04 12:18:36 +03:00
alisan617
55dd177573 Merge pull request #13873 from edx/alisan/data-download-report-pending-task-fix 
Fix instructor dashboard data download pending task message
 2016-11-03 20:55:13 -04:00
Matthew Piatetsky
af976a0ef5 Add JWT auth and hidden flag to course_api 2016-11-03 17:35:45 -04:00
alisan617
f62c7e24b4 fix a typo 2016-11-03 17:29:30 -04:00
Cliff Dyer
0d8a54a1ea Merge pull request #13904 from edx/release-candidate 
Patch 2016-11-03: LTI mgt command merge to release
 2016-11-03 16:51:32 -04:00
Diana Huang
fd6d8b6f8d Merge pull request #13907 from edx/diana/fix-lms-urls 
Add 404 and 500 handlers back in.
 2016-11-03 15:45:44 -04:00
Adam
940787a10e Merge pull request #13906 from edx/unicode-errors-refund-messages 
handle refund notification message formatting when translated with un…
 2016-11-03 14:56:36 -04:00
Gregory Martin
f21dbc797a Merge pull request #13794 from edx/yro_implement-dateutil 
Implement DateUtils in LMS
 2016-11-03 13:51:46 -04:00
Adam Palay
9068c7e2b0 handle refund notification message formatting when translated with unicode characters (ECOM-5858) 2016-11-03 13:30:40 -04:00
Toby Lawrence
800daa9c1d Merge pull request #13844 from edx/PERF-386 
[PERF-386] Utilize ForumsConfig to enable and disable forums.
 2016-11-03 13:14:20 -04:00
Ned Batchelder
1e6e88ca25 Merge pull request #13905 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-11-03 12:52:34 -04:00
Ned Batchelder
017f5303ce Update translations (autogenerated message) 2016-11-03 15:38:24 +00:00
Max Rothman
68bf1c5263 Merge pull request #13890 from edx/max/nodeenv 
Switch to using nodeenv
 2016-11-03 11:03:33 -04:00
Diana Huang
c9beb7f795 Add 404 and 500 handlers back in. 2016-11-03 10:44:52 -04:00
Troy Sankey
adfb02532b Merge pull request #13809 from edx/pwnage101/PERF-354-NR-user-state-client 
* Implement the newrelic_custom_metrics middleware
* Instrument DjangoXBlockUserStateClient with New Relic
 2016-11-03 10:42:25 -04:00
Troy Sankey
076c63bcf5 Instrument DjangoXBlockUserStateClient with New Relic 
Report to New Relic certain per-request details about the
DjangoXBlockUserStateClient.  The following metrics are reported for the
get_many() call:

xb_user_state.get_many.calls
xb_user_state.get_many.duration
xb_user_state.get_many.blocks_requested
xb_user_state.get_many.blocks_out
xb_user_state.get_many.size
xb_user_state.get_many.<block_type>.blocks_requested
xb_user_state.get_many.<block_type>.blocks_out
xb_user_state.get_many.<block_type>.size

Similarly, for the set_many() call:

xb_user_state.set_many.calls
xb_user_state.set_many.duration
xb_user_state.set_many.blocks_created
xb_user_state.set_many.blocks_updated
xb_user_state.set_many.size
xb_user_state.set_many.<block_type>.blocks_created
xb_user_state.set_many.<block_type>.blocks_updated
xb_user_state.set_many.<block_type>.size

Where <block_type> is one of "chapter", "course", "problem", "video",
etc.

PERF-354
 2016-11-03 10:30:38 -04:00
Troy Sankey
ece785ff92 Implement the newrelic_custom_metrics middleware 
Use this middleware and its helpers to accumulate custom New Relic
metrics on a per-request basis.  If, while handling a request, the app
does not accumulate any metrics, this middleware is a very lightweight
no-op.

This commit also enables the middleware!

PERF-354
 2016-11-03 10:30:25 -04:00
Toby Lawrence
2acb4a6cad [PERF-386] Utilize ForumsConfig to enable and disable forums. 
This specifically enables/disables the underlying comment service client
used to make calls to the service.  When disabled, this client will now
throw an exception which can be propagated upwards so that callers can
make the right decision about how to notify users of the error, or
handle retry, etc etc.
 2016-11-03 10:20:19 -04:00
Gregory Martin
3fd16eb6be Implement DateUtils in LMS 2016-11-03 10:06:10 -04:00
Cliff Dyer
6d0bb5f5fd Merge pull request #13902 from edx/patch/2016-11-03 
Patch release with mgt command to resend LTI scores.
 2016-11-03 09:57:29 -04:00
Cliff Dyer
1a3022920d Merge pull request #13866 from edx/cdyer/refire-grades 
Create management command to send lti_provider scores to lti consumers.
 2016-11-03 09:03:08 -04:00
Mushtaq Ali
dc8d020e30 Merge pull request #13875 from edx/revert-13242-ekafeel/TNL-5256-prettify-xml 
Revert "format xml before displaying"
 2016-11-03 14:34:03 +05:00
Mushtaq Ali
d337da7458 Remove pretty print from markdown xml - TNL-5768 
Revert commit bf9d467
 2016-11-03 12:15:48 +05:00
Mushtaq Ali
0e8dacc72a Revert "format xml before displaying" 2016-11-03 12:01:30 +05:00
Diana Huang
6c37e2826e Merge pull request #13897 from edx/diana/update-lti-hash 
Update xblock-lti-consumer version.
 2016-11-02 16:52:38 -04:00
Eric Fischer
00b117586a Merge pull request #13894 from edx/release 
Hotfix 2016-11-02 Release to master
 2016-11-02 16:27:32 -04:00
Diana Huang
1dde6bddbb Update xblock-lti-consumer version. 2016-11-02 15:56:26 -04:00
Andy Armstrong
2bf8254efd Merge pull request #11491 from edx/andya/use-pattern-library-fonts 
Use fonts from the Pattern Library
 2016-11-02 15:34:58 -04:00
Eric Fischer
b00e51268a Merge pull request #13891 from edx/release-candidate 
Update release with latest release-candidate
 2016-11-02 15:13:48 -04:00
J. Cliff Dyer
df08e8fde1 Add mgmt command to rescore lti problems for a set of courses. 
TNL-5778
 2016-11-02 13:11:31 -04:00
Albert (AJ) St. Aubin
5afab424a6 Merge pull request #13858 from edx/aj/TNL-5582_flaky_updates_test 
Update to reduce flakiness of this test set removed flaky annotation
 2016-11-02 12:42:55 -04:00
Kevin Falcone
7c94992fa0 Merge pull request #13892 from edx/jibsheet/fix-problem-builder-version 
problem-builder's tags are vX.Y.Z not X.Y.Z
 2016-11-02 12:29:55 -04:00
Kevin Falcone
0016d1af4e problem-builder's tags are vX.Y.Z not X.Y.Z 2016-11-02 11:34:04 -04:00
Albert St. Aubin
f1101a7ba3 Update to reduce flakiness of this test set removed flaky annotation 
TNL-5582
 2016-11-02 11:19:24 -04:00