Commit Graph

7927 Commits

Author SHA1 Message Date
David Baumgold
c388b408e1 Merge pull request #3054 from louyihua/fix-chinese-language-name
Fix the chinese name of chinese language in common.py
2014-03-31 13:52:26 -04:00
Sarina Canelake
36185936dd Merge pull request #3130 from edx/sarina/033114-language-update
Update translations (autogenerated message)
2014-03-31 13:43:24 -04:00
David Baumgold
cbfe12fc9c Merge pull request #3088 from fmyzjs/patch-3
Update course_about.html
2014-03-31 13:36:55 -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
2ec08921e5 Revert "Fix tests."
This reverts commit 1ed167d90a.
2014-03-31 19:42:44 +03:00
Alexander Kryklia
1ed167d90a Fix tests. 2014-03-31 19:41:08 +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
Sarina Canelake
6fef664309 Update translations (autogenerated message) 2014-03-31 10:42:17 -04:00
Valera Rozuvan
34ac619086 Addressing comments. 2014-03-31 14:47:11 +03:00
Valera Rozuvan
4610bd1b18 Add acceptance test for blocked YouTueb API with HTML5 sources
When the video has both YouTube IDs and HTML5 sources, and
the YouTube API is blocked, then HTML5 sources should be
used.
2014-03-31 14:47:11 +03:00
Waheed Ahmed
f748173b60 Merge pull request #3086 from edx/waheed/fix-lagacy-dash-numeric-placeholders
Fixed legacy dash numeric placeholders with named.
2014-03-31 14:49:18 +05:00
Waheed Ahmed
375c206a2b Fixed lagacy dash numeric placeholders with named. 2014-03-31 12:06:31 +05:00
Waheed Ahmed
eb9133aeb6 Open ended panel headings not internationalized.
LMS-2169
2014-03-31 11:25:10 +05: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
a4f6a67f0f Adding acceptance test for multiple videos.
Part of BLD-972.
2014-03-30 00:14:32 +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
Jay Zoldak
748fc120cd Disable failing video test 2014-03-28 16:20:04 -04:00
Jay Zoldak
1532badfe5 Skip video test that is failing in master 2014-03-28 15:01:29 -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
6dd6f0c79d Add more tags to comment_client request metrics
This captures real-time metrics for all of the comment client actions,
segregated by course_id, as well as other small-cardinality fields.

The goal is to be able to detect changes in forum usage, with the goal
of alerting on potential error conditions.
2014-03-28 11:37:44 -04:00
Calen Pennington
ec1b056d82 Use requests library utility method for getting json results 2014-03-28 11:37:43 -04:00
Calen Pennington
cb93b66582 Remove unused *args and **kwargs from perform_request 2014-03-28 11:37:43 -04:00
Calen Pennington
d4db0ee7e4 Remove unused methods from comment_client 2014-03-28 11:37:43 -04:00
Carson Gee
9e58ef692d fix raw grade dump in standard instructor dashboard
Added test and cleaned up code formatting
Review based changes
Converting class method and attributes to private
2014-03-28 11:10:14 -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
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
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
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -04:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
Jason Zhu
a29485960d Update course_about.html
if course title use Chinese or other language got the 500 error when visit the course_about page ,and the log shows :UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-3: ordinal not in range(128)
2014-03-27 23:00:02 +08:00
Adam
2e174f2aa7 Merge pull request #3070 from edx/adam/middleware
wiki middleware fix (LMS-2461)
2014-03-26 16:36:17 -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
louyihua
0316f3b758 i18n: make emails in lms translatable
The email texts in lms/templates/emails are not extracted by rake i18n:generate because the babel_mako.cfg does not include them.
And a several emails are not translatable because they do not use ugettext.
2014-03-26 22:33:21 +08:00
Usman Khalid
76e592634a Some more str->unicode fixes in instructor and courseware apps.
LMS-2429
2014-03-26 18:57:02 +05:00
Waheed Ahmed
62fdf33c6f Merge pull request #2938 from edx/waheed/lms2167-show-submission-history-not-internationalized
Internationalized submission history view.
2014-03-26 18:31:41 +05:00
polesye
a1c957ecd3 BLD-951: Fix flaky tests. 2014-03-26 11:45:17 +02:00
Waheed Ahmed
94af663683 Submission history view not internationalized.
LMS-2167
2014-03-26 13:14:02 +05:00
David Baumgold
4801b4b392 Merge pull request #3060 from edx/db/display-error-pages
Display error page templates, for testing purposes
2014-03-25 15:36:51 -04:00
David Baumgold
f5f7b77d4e Display error page templates, for testing purposes
This commit allows us to test the server error template by visiting `/500`. This
way, we can catch errors in our error templates, instead of having infinitely
recursing errors.
2014-03-25 14:55:14 -04:00
David Baumgold
64265ee58a Merge pull request #3032 from IONISx/feature-enable-mktg-site-is-missing
Added ENABLE_MKTG_SITE to Features
2014-03-25 13:22:28 -04:00
Will Daly
44dad41ede Switch from Rake to Paver 2014-03-25 11:32:19 -04:00
Will Daly
ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase
Install new ORA (edx-tim)
2014-03-25 10:59:05 -04:00
Will Daly
440d9ddb89 Install edx-ora2
Support for displaying submissions API scores in Progress page.
2014-03-25 09:42:55 -04:00
louyihua
2a658ed8b5 i18n: Fix the chinese name of chinese language
The current version of chinese language's chinese name is not political neutral.
In fact, which form of chinese (traditional or simplified) can be called "正體"(in traditional chinese) or "正体"(in simplified chinese) is not globally defined.
So, I change the name according to the word used by Microsoft Windows, which is more neutral.
2014-03-25 20:35:44 +08:00
Gabe Mulley
3f31833178 Clean up references to answer distribution-like things
In the near future an answer distribution report will be displayed in the data download reports table.  In order to avoid confusion, we need to clean up several misleading labels and remove a redundant feature.

Note that the redundant feature is surrounded by a feature flag so that it can be disabled once the report goes live in the table.

Fixes: AN-694
2014-03-24 16:57:56 -04:00