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

22222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
75489cff24 Merge pull request #3143 from edx/adam/merge-release-to-master 
Adam/merge release to master
 2014-03-31 16:32:50 -04:00
Mark Hoeber
8452ee7c0d Merge pull request #3132 from edx/markhoeber/documentation/stud-1488 
Added note about pages being publicly viewable
 2014-03-31 16:19:08 -04:00
Adam Palay
1a538388be Merge remote-tracking branch 'origin/release' 
Conflicts:
	requirements/edx/edx-private.txt
 2014-03-31 15:41:20 -04:00
Adam
83bdd68095 Merge pull request #3135 from edx/hotfix/fix-jsdraw-input-2 
Upgrade JSdraw input.
 2014-03-31 15:39:15 -04:00
Andy Armstrong
2086d09ff5 Merge pull request #3121 from louyihua/translation-fix-cms 
Translation fix in studio: For better translation in unit.html
 2014-03-31 15:37:57 -04:00
David Baumgold
523532898a Merge pull request #3140 from edx/db/paver-respect-no-prereq-install 
Make paver respect NO_PREREQ_INSTALL
 2014-03-31 15:28:04 -04:00
David Baumgold
f6660f4c63 Make paver respect NO_PREREQ_INSTALL 2014-03-31 15:23:31 -04:00
louyihua
582971755a Translation fix in studio: For better translation 
As the sentence in unit.html is splitted into three parts due to the varible release_date may be None, it breaks the integrity of a sentence.
Different language may have different word or event grammer order, so if a sentence is breaked into three parts, translators cannot adjust the word orders to create a good translation.
So this fix tries to combine the sentence together.
 2014-04-01 02:23:02 +08:00
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
Calen Pennington
f13d1460d2 Merge pull request #3107 from FiloSottile/optimize_dataexport 
Update reference to the xblock-mentoring repo for optimized dataexport
 2014-03-31 13:42:25 -04:00
Frances Botsford
a01d296d1c moved Studio public Pages warning to a more prominent location 2014-03-31 13:42:06 -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
Chris Rossi
587e9b5c1c Upgrade JSdraw input. 2014-03-31 12:36:36 -04:00
Alexander Kryklia
b3f479c8dc Merge pull request #2899 from edx/alex/multiple_transcripts_editor 
Alex/multiple transcripts editor
 2014-03-31 19:28:00 +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
Mark Hoeber
900642345b Merge pull request #2830 from edx/ahodges/documentation/answerdist 
Ahodges/documentation/answerdist
 2014-03-31 11:30:09 -04:00
Alison Hodges
f81908e5a8 Documentation for answer distributions 2014-03-31 11:29:43 -04:00
Mark Hoeber
bb4f30b31a Added note about pages being publicly viewable 
STUD-1488
 2014-03-31 11:14:39 -04:00
Sarina Canelake
78c8bcaab1 Merge pull request #3115 from edx/sarina/update-i18n-translators-docs 
Update Translation documentation
 2014-03-31 10:59:08 -04:00
Sarina Canelake
6fef664309 Update translations (autogenerated message) 2014-03-31 10:42:17 -04:00
Valera Rozuvan
e6d2f32376 Merge pull request #3102 from edx/valera/add_acceptance_test_youtube_html5_blocked_api 
Add acceptance test for blocked YouTueb API with HTML5 sources
 2014-03-31 16:15:42 +03:00
zubair-arbi
9b3edaa0e9 Merge pull request #3010 from edx/zub/bugfix/std1455-studioaccessissue 
raise ItemNotFoundError if course not found in modulestore (course_listing)
 2014-03-31 17:32:36 +05: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
zubiar-arbi
2b389a2dfa raise ItemNotFoundError if course not found in modulestore (course_listing) 
STUD-1455
 2014-03-31 14:12:38 +05:00
Waheed Ahmed
375c206a2b Fixed lagacy dash numeric placeholders with named. 2014-03-31 12:06:31 +05:00
Waheed Ahmed
c3b8380d41 Merge pull request #2940 from edx/waheed/lms2169-open-ended-panel-headings-not-internationalized 
Internationalized open ended panel headings.
 2014-03-31 12:04:49 +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
Carlos Andrés Rocha
487b778275 Merge pull request #3124 from edx/valera/fix_multiple_videos_on_page_RELEASE 
Valera/fix multiple videos on page release
 2014-03-29 20:13:29 -04:00
Valera Rozuvan
a4f6a67f0f Adding acceptance test for multiple videos. 
Part of BLD-972.
 2014-03-30 00:14:32 +02: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
Filippo Valsorda
86e5c54a77 Update reference to the xblock-mentoring repo for optimized dataexport 
The new ref is gsehub/xblock-mentoring@43aa320

Optimize mentoring-dataexport times by using values_list()
 2014-03-29 16:01:13 +01:00
Sarina Canelake
7b13cd32f1 Update Translation documentation 2014-03-28 20:30:27 -04: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
b5fb8cb0d6 Merge pull request #3114 from edx/zoldak/skip-failing-video-test 
Disable failing video test
 2014-03-28 16:21:09 -04:00
Jay Zoldak
748fc120cd Disable failing video test 2014-03-28 16:20:04 -04:00
Mark Hoeber
6dfcb8e2d3 Merge pull request #3006 from edx/markhoeber/documentation/DOC-105 
Markhoeber/documentation/doc 105
 2014-03-28 16:02:51 -04:00
Mark Hoeber
7ac2270853 Custom JavaScript Display and Grading 
DOC-105
 2014-03-28 16:01:57 -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
Jay Zoldak
ce787d2759 Merge pull request #3112 from edx/zoldak/skip-failing-tests 
Temporarily disable the bok-choy test that is intermittently failing
 2014-03-28 15:39:09 -04:00
Mark Hoeber
cef471d4bf Merge pull request #3038 from edx/ahodges/documentation/dataczar 
AN-167 New chapter on role & skills of data czar and research team
 2014-03-28 15:37:43 -04:00
Alison Hodges
8d82733284 AN-167 New chapter on role & skills of data czar and research team 2014-03-28 15:37:16 -04:00