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

28200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
louyihua
3b14ee8a04 Fix a decode error in course_about.html and make some string translatable 
The strings in share links should be in unicode, otherwise when the name of a course is non-ascii, it will generate a decode error.
And some of these strings is actually translatable, so they should be collected into mako.po.
 2014-04-01 23:49:32 +08:00
Stephen Sanchez
1c55ce0a62 Updating ora2 requirements 2014-04-01 11:44:54 -04:00
Mark Hoeber
f1999d8949 Fixed nested bullets to enable PDF 
4 levels of bullets don’t work with latex

DOC-250
 2014-04-01 10:46:37 -04:00
Valera Rozuvan
8708c37a01 Merge pull request #3126 from edx/valera/convert_xmodule_to_javascript 
Converting XModule module to JS.
 2014-04-01 17:26:24 +03:00
Dave St.Germain
8cfdcb93b2 Fixes LMS-1740 by activating the zooming diagram with the spacebar. 2014-04-01 10:12:21 -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
Valera Rozuvan
269d72469b Converted XModule to JavaScript. Added Jasmine tests. 
Part of the process for removing CoffeeScript from
edx-platform dependencies. Covering XModule with JavaScript
Jasmine unit tests.
 2014-04-01 16:45:44 +03:00
David Baumgold
4c23f9286c Merge pull request #3138 from edx/db/add-getusermedia-note 
Added comment to getUserMedia call in photocapture.js
 2014-04-01 09:04:07 -04:00
David Baumgold
ac18d6a002 Merge pull request #3141 from edx/db/doc-xblock-signature 
Doc: update xblock publish() function signature
 2014-04-01 09:03:29 -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
Waheed Ahmed
19e9ff7cb3 Fixed studio can't handle more than 9 lines in advanced settings. 
STUD-1483
 2014-04-01 15:36:15 +05:00
polesye
92cd46277d BLD-950: Update captions logic on front-end. 2014-04-01 12:25:45 +03:00
Alexander Kryklia
e2de072f9b Fix flaky acceptance test. 2014-04-01 12:20:05 +03:00
Waheed Ahmed
b1a0cc9d2c Merge pull request #3100 from edx/waheed/ora351-change-wording-for-setting-up-ora-question 
Changed wording for setting up ORA question.
 2014-04-01 12:05:25 +05: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
Dave St.Germain
52ca42266c Merge pull request #3098 from edx/dcs/paver-watch-assets 
Watch for asset changes.
 2014-03-31 16:38:53 -04:00
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
Dave St.Germain
f886c9b7c5 Watch for asset changes. 2014-03-31 15:28:15 -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
c6200a4842 Doc: update xblock publish() function signature 2014-03-31 15:27:01 -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
David Baumgold
ce0bc8f8dd Added comment to getUserMedia call in photocapture.js 2014-03-31 13:46:21 -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
Chris Dodge
ff8a0c6891 password history: just limit the result set range to simplify iteration logic 2014-03-31 10:30:58 -04:00
Chris Dodge
d5bb1b5cca Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets 2014-03-31 10:30:58 -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