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

39217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Stu Young
964588f57f Merge pull request #13869 from edx/estute/log-pip-freeze 
log pip freeze output for debugging jenkins builds
 2016-11-02 10:54:05 -04:00
Max Rothman
1f22f47534 Switch to using nodeenv 2016-11-02 10:28:54 -04:00
Diana Huang
464ab1a154 Merge pull request #13641 from open-craft/jill/problem-builder-edx-release 
Updates problem-builder version to match master
 2016-11-02 09:35:29 -04:00
Nimisha Asthagiri
ceeb0e35f6 Merge pull request #13887 from edx/hotfix2/2016-11-01 
Add grades feature check to subsection task handler.
 2016-11-02 08:23:54 -04:00
Nimisha Asthagiri
8ae20e3812 Add grades feature check to subsection task handler. 2016-11-01 21:21:04 -04:00
Jillian Vogel
d6787cd13b Updates problem-builder version to use 2.6.0 
Ref: https://github.com/open-craft/problem-builder/pull/119
 2016-11-02 11:03:01 +10:30
Kevin Falcone
4fb8064722 Merge pull request #13882 from edx/jibsheet/upgrade-django-1.8.16 
Upgrade to django 1.8.16 for the security release
 2016-11-01 16:44:45 -04:00
Eric Fischer
f03e2ce685 Merge pull request #13884 from edx/hotfix/2016-11-01 
Hotfix for grades issues in 2016-11-01 release
 2016-11-01 16:07:35 -04:00
Eric Fischer
a54c4ea4f9 Revert "Unrevert "Fix Gating to use grades API, instead of its own calculations"" 
This reverts commit 7aacae9a4f.
 2016-11-01 15:02:04 -04:00
Christina Roberts
de5b989e06 Merge pull request #13862 from proversity-org/proversity/fix-closing-tag 
Fix bad closing tag in staff problem info template
 2016-11-01 14:39:19 -04:00
Andy Armstrong
369b9baad6 Use fonts from the Pattern Library 
* Updated the SASS to point to the Pattern Library
* Removed duplicate copies of fonts
 2016-11-01 14:35:36 -04:00
Eric Fischer
caeac6921a Fast-fail grades tasks if feature flag disabled 2016-11-01 13:34:10 -04:00
Carol Tong
689f614e71 Merge pull request #13576 from mehulsr/master 
DOC-2921 Fix certificates Studio page sidebar Help text
 2016-11-01 13:12:16 -04:00
Matthew Piatetsky
c089ea42b4 Merge pull request #13880 from edx/release 
Merge release into master
 2016-11-01 11:59:32 -04:00
Kevin Falcone
aae4bce3af Upgrade to django 1.8.16 for the security release 
https://www.djangoproject.com/weblog/2016/nov/01/security-releases/
 2016-11-01 11:29:03 -04:00
stu
48b2575ca5 log pip freeze output for debugging jenkins builds 2016-11-01 11:21:46 -04:00
Matthew Piatetsky
333c68665b Merge pull request #13865 from edx/release-candidate 
Release Candidate rc/2016-11-01
 2016-11-01 10:52:21 -04:00
Mehul Smriti Raje
86b5218fec [DOC - 2921] - Fix certificates Studio page sidebar Help text 
[DOC - 2921] Removed the emphasis on 'activate' and 'issuing'

[DOC-2921] Removed the format statement
 2016-11-01 16:18:07 +05:30
Andy Armstrong
9d1e77e028 Merge pull request #13840 from edx/andya/support-proctoring-only 
Allow authors to remove option for unproctored exams
 2016-10-31 18:01:52 -04:00
Andy Armstrong
afee725fb1 Allow authors to remove option for unproctored exams 
TNL-5084
 2016-10-31 16:58:15 -04:00
Matthew Piatetsky
5eece3a935 Merge pull request #13870 from edx/include_hidden_revert 
Revert "Merge pull request #13846 from edx/ECOM-5050"
 2016-10-31 14:22:49 -04:00
Jesse Zoldak
f8e7a5d4a2 Merge pull request #13872 from edx/revert-13814-benp/fix-bok-choy-mp 
Revert "Bug fix: collect test results when running in multiprocess mode."
 2016-10-31 11:40:55 -04:00
Jesse Zoldak
8e31eee734 Revert "Bug fix: collect test results when running in multiprocess mode." 2016-10-31 11:37:30 -04:00
Matthew Piatetsky
dc5f251938 Revert "Merge pull request #13846 from edx/ECOM-5050" 
This reverts commit c6b6d0bc74, reversing
changes made to fa2b1ae470.
 2016-10-31 10:04:20 -04:00
noraiz-anwar
902d7324a5 Merge pull request #13807 from edx/na/ECOM-6167 
Logging improved for case when exception is raised during submission to SoftwareSecure
 2016-10-31 16:58:35 +05:00
Jillian Vogel
ba9242b37c Merge pull request #12633 from tanmaykm/tanmaykm/video-upload 
MA-333 Added ability to refresh uploaded videos
 2016-10-31 18:18:05 +10:30