Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,242 Commits 1 Branch 0 Tags
0513e144b1be90a49e45cc7c8b7cd30da8dedbb0
Commit Graph

7900 Commits

Author SHA1 Message Date
Calen Pennington
0513e144b1 Actually push json parsing all the way down to the bottom of the GradingService get and post methods 2014-04-01 14:04:17 -04:00
Calen Pennington
f2b554db2a Record metrics about the peer grading service 2014-04-01 14:04:17 -04:00
Calen Pennington
6430e7e98c Make GradingServices always return dictionaries, rather than sometimes returning strings 2014-04-01 14:04:16 -04:00
Calen Pennington
bdee9a9857 Correctly catch RubricParsingErrors 2014-04-01 14:04:16 -04:00
Calen Pennington
fe7e420ad5 Collect metrics around the open_ended_grading controller_query_service 2014-04-01 14:04:16 -04:00
Calen Pennington
6c06b39b3f Centralize when json parsing of responses from controller_query_service happens 2014-04-01 10:10:54 -04:00
Calen Pennington
d0daa61705 Remove unused function 2014-04-01 10:10:54 -04:00
Diana Huang
f3ff6cf318 Merge pull request #3144 from edx/diana/monitor-xqueue-graders 
Add in metric tracking to xqueue.
 2014-04-01 10:07:19 -04:00
Anton Stupak
08538e89c1 Merge pull request #3128 from edx/anton/transcript-generation 
Update captions logic on front-end.
 2014-04-01 14:53:50 +03:00
polesye
92cd46277d BLD-950: Update captions logic on front-end. 2014-04-01 12:25:45 +03:00
Waheed Ahmed
eaa5b6ed6f Changed wording for setting up ORA question. 
ORA-351
 2014-04-01 11:12:24 +05:00
Diana Huang
9b3d68c2b9 Add in metric tracking to xqueue. 
Covers external grading and certificates.
 2014-03-31 16:50:23 -04:00
Alexander Kryklia
64e286763d Revert "Transcript translations should be displayed in their source language." 
This reverts commit b4ba04bae9.
 2014-03-31 19:42:52 +03:00
Alexander Kryklia
b4ba04bae9 Transcript translations should be displayed in their source language. 2014-03-31 19:40:56 +03:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor. 
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
 2014-03-31 18:49:56 +03:00
Carlos Andrés Rocha
7d618f26ca Merge branch 'release' 
Conflicts:
	lms/djangoapps/courseware/features/video.feature
 2014-03-29 20:37:49 -04:00
Valera Rozuvan
a883d2530d Fix multiple videos on page 
If there are several videos on page, make sure that
the global onYouTubeIframeAPIReady function is properly
setup so that all callbacks are trigerred when the YouTube API
loads.

BLD-972
 2014-03-29 23:58:15 +02:00
Calen Pennington
bb2508aca4 Merge pull request #3062 from cpennington/comment-client-metrics 
Add metrics to comment_client requests
 2014-03-28 16:34:24 -04:00
Calen Pennington
f4e55ccb76 Merge pull request #3061 from cpennington/model-metrics 
Add datadog metrics logging for django model creates, updates, and deletes
 2014-03-28 16:33:53 -04:00
Adam
a343d3368d Merge pull request #3113 from edx/adam/merge-release-2 
Adam/merge release 2
 2014-03-28 15:59:25 -04:00
Adam Palay
c6743376f0 Merge remote-tracking branch 'origin/release' into adam/merge-release-2 2014-03-28 15:15:47 -04:00
Jay Zoldak
65bae9a655 Temporarily disable the bok-choy test that is intermittenly failing 2014-03-28 15:12:46 -04:00
Calen Pennington
81a038cbaf Add datadog metrics logging for django model creates, updates, and deletes 2014-03-28 14:45:59 -04:00
Gabe Mulley
05d959bc09 Merge pull request #3089 from mulby/gabe/publish 
Support emitting analytical events from xblocks running in the LMS
 2014-03-28 13:58:52 -04:00
Calen Pennington
d4db0ee7e4 Remove unused methods from comment_client 2014-03-28 11:37:43 -04:00
Usman Khalid
e1afbe5011 Merge pull request #3058 from edx/usman/lms2429-unicode-error-fixes 
Unicode support fixes
 2014-03-28 20:08:27 +05:00
Adam Palay
8e01f1781e temporarily remove SR on capa alerts to fix problem submissions (LMS-2474) 2014-03-28 09:45:59 -04:00
Nimisha Asthagiri
1bd6792a08 Support for "View Live" on Pages page. 
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
 2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Valera Rozuvan
3f41aae9f7 Make YouTube mocked server serve YouTube API 
1.) Making YouTube mock server serve YouTube API.
2.) Adding ability to block YouTube API from YouTube mock server.
3.) Adding acceptance tests that check YouTube mock server for availability of YouTube API, and for it's ability to block YouTube API.

Part of BLD-939.
 2014-03-28 10:34:34 +02:00
Valera Rozuvan
b35994f12e Merge pull request #3090 from edx/valera/update_youtube_stub_server_doc 
Update doc string for YouTube stub server.
 2014-03-28 09:15:35 +02:00
Gabe Mulley
d6052675da Support emitting analytical events from xblocks running in the LMS 
XBlocks can and should use the "publish" method provided by the runtime to emit analytical events. In theory we could now start replacing calls to track_function with calls to publish, however, that migration is not handled by this change.

Fixes: AN-789
 2014-03-27 18:50:46 -04:00
Dave St.Germain
a6bde7cc9e Fix broken test due to refactoring. 2014-03-27 16:44:07 -04:00
Dave St.Germain
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -04:00
Valera Rozuvan
f03a94b0f2 Update doc string for YouTube stub server. 
Included information on how to launch the server
on its own.
EOF
 2014-03-27 21:21:38 +02:00
Valera Rozuvan
e50fad6475 Fix failing tender. 2014-03-27 20:36:08 +02:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
David Baumgold
2d452d8bb2 Merge pull request #3005 from singingwolfboy/db/paver 
Paver v3
 2014-03-26 13:41:05 -04:00
cahrens
2c79c1fe2f Revert to older version of TinyMCE. 
We had trouble with Cloudfront/hashed files and need more time
to investigate.
This reverts commit e8f53ac9dc6d8a1d9928787635c7c5f7e409a9ec.
 2014-03-26 11:06:59 -04:00
jmclaus
61752e69ff Added template for iFrames. [BLD-611] 2014-03-26 05:03:43 +01:00
Usman Khalid
7323341a4b Changed str->unicode in common/djangoapps/utils/. 
LMS-2436
 2014-03-25 20:43:12 +05:00
Will Daly
44dad41ede Switch from Rake to Paver 2014-03-25 11:32:19 -04:00
zubair-arbi
22205c35c8 Merge pull request #2985 from edx/zub/story/deletecoursefromlocmapper 
remove course location from loc_mapper on delete
 2014-03-25 12:44:04 +05:00
Dave St.Germain
3539c56f89 Added image tags to the whitelist for matlab 2014-03-24 18:53:07 -04:00
Dave St.Germain
93844b3ad1 Merge pull request #3025 from edx/dcs/fix-matlab-response 
Fixes BLD-948 by escaping messages from xqueue, preventing malformed
 2014-03-24 13:54:36 -04:00
Dave St.Germain
5cb145054d Fixes BLD-948 by escaping messages from xqueue, preventing malformed 
html from getting onto the page. The client will then unescape the html
and display it.
 2014-03-24 13:28:08 -04:00
Valera Rozuvan
1c8eed853e Moved all YouTube related URLs to a separate namespace. 
All YouTube urls are defined on backend side.
 2014-03-24 18:40:28 +02:00
Alexander Kryklia
156b531293 Merge pull request #2732 from edx/alex/fix_typo 
Fix typo in transcripts_utils.
 2014-03-24 18:20:46 +02:00
Andy Armstrong
664f78dcb1 Merge pull request #2657 from edx/christina/tinymce-upgrade 
Upgrade TinyMCE and switch to CodeMirror plugin
 2014-03-24 11:53:17 -04:00
cahrens
c8eaa53452 Fix typos. 2014-03-24 10:49:29 -04:00