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

39247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alisan617
e80d9b5792 Refactor discussion tab UI code into parts to be reusable for inline discussions 
TNL-5669
 2016-11-08 14:17:01 -05:00
sanfordstudent
8ffc9197e8 Merge pull request #13881 from edx/efischer/tnl-5314 
Dashboard Final Grade Updates
 2016-11-07 16:08:06 -05:00
Diana Huang
c24cdfb035 Merge pull request #13931 from edx/diana/update-proctoring 
Update to latest proctoring release.
 2016-11-07 15:13:17 -05:00
Sanford Student
54df702630 Dashboard final grade display uses PersistedCourseGrade 
Will fall back to stored certificate grade if needed as we've discussed.

TNL-5314
 2016-11-07 14:00:27 -05:00
Cliff Dyer
7db6dc7d7f Merge pull request #13895 from edx/cdyer/flaky-request-factory-as-request 
Fix sporadic "'RequestFactory' object has no attribute 'build_absolute_uri'" python test error.
 2016-11-07 13:55:09 -05:00
Adam
332fcd0c9b Merge pull request #13924 from edx/adam/neo4j-lists 
only pass lists of text as iterable neo4j values
 2016-11-07 12:49:41 -05:00
Diana Huang
23a0099f6a Update to latest proctoring release. 2016-11-07 11:11:00 -05:00
J. Cliff Dyer
9366c43a83 Fix issues with RequestFactory used as Request. 
* Centralize creation of quick request objects.
* Isolate caches to individual tests to prevent test ordering
  dependencies.

TNL-5811
 2016-11-07 10:51:04 -05:00
Adam Palay
e4b39c5c42 only pass lists of text as iterable neo4j values 2016-11-07 10:48:42 -05:00
Attiya Ishaque
4319a8288a Merge pull request #13816 from edx/atiya/celery-email-sending-on-registration 
ECOM-5281 Adding retries and celery task for sending activation email.
 2016-11-07 14:17:07 +05:00
attiyaishaque
0ffde1a620 ECOM-5281 Adding retries and celery task for sending activation email. 2016-11-07 11:23:43 +05:00
Syed Hasan raza
8234581024 Merge pull request #13853 from edx/shr/bug/TNL-5591-update-orientation-with-None-value 
fix None value for orientation update
 2016-11-06 17:56:04 +05: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
Syed Hassan Raza
178e497c65 fix None value for orientation update 2016-11-04 16:48:25 +05: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