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

22819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Kryklia
90437fa5e0 Display transcript translations for student in their source language. 2014-04-02 10:47:37 +03:00
louyihua
80e1270587 Make new-style chinese language codes works for translation 
The old-style chinese language codes used in django 1.4 series are now deprecated, as discussed here:  https://code.djangoproject.com/ticket/18419.
Although majority of browsers still use the old-style language codes, some new browsers such as IE11 in Windows 8.1 start to use the new-style names instead of old-style ones which makes the current chinese translations of edX can't work properly under these browsers.
As there is no easy way for edX to change a higher version of django, I think we could do some mapping here so that the users who use IE11 in Windows 8.1 or other browsers that use the new-style names can view correct translations.
Also, this fix will make users who use one of the language codes:  zh-hk ,  zh-sg  and  zh-mo  can see the correct translations.
 2014-04-02 13:12:44 +08:00
Calen Pennington
c54972e855 Fix bad interaction between pluggable InputTypes and Microsites 
Pluggable InputTypes use edxmako.paths.add_lookup to inject new
mako template directories. Those were getting clobbered by microsites
(and by theming), which were completely rebuilding the mako template
lookup list from scratch.

This commit switches those two features to use the same add_lookup
function as pluggable InputTypes.

[LMS-2489]
 2014-04-01 16:49:15 -04:00
Calen Pennington
630a0b08ba Capture metrics for problem attempts and histograms of problem grades 2014-04-01 16:35:28 -04:00
Calen Pennington
1bd0bcb8c0 Merge pull request #3091 from cpennington/ora-metrics 
Add metrics around old ORA requests
 2014-04-01 16:09:11 -04:00
Sarina Canelake
4b1228be92 Merge pull request #3119 from louyihua/translation-fix 
Fix a decode error in course_about.html and make some string translatable
 2014-04-01 15:43:10 -04:00
Calen Pennington
2689967905 Merge pull request #3158 from cpennington/enrollment-metrics 
Emit datadog events for all course enrollments, not just those outside of verified courses
 2014-04-01 14:05:10 -04:00
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
c9a5e9b88d Record metrics about the staff grading service 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
Mark Hoeber
cee1ebc91c Merge pull request #3157 from edx/markhoeber/documentation/PDF-fix 
Fixed nested bullets to enable PDF
 2014-04-01 13:26:46 -04:00
Dave St.Germain
66ecbc9e6e Merge pull request #3134 from edx/dcs/a11y-gentle-alert 
Fixes LMS-2474 by ensuring that readElts reads always reads an element
 2014-04-01 13:15:27 -04:00
Greg Price
153fd49f36 Merge pull request #3110 from edx/gprice/inline-visual-fixup 
Improve inline discussion UI
 2014-04-01 13:13:34 -04:00
Calen Pennington
9bcbba6750 Emit datadog events for all course enrollments, not just those outside of verified courses 2014-04-01 13:02:29 -04:00
Stephen Sanchez
363702ea6d Merge pull request #3159 from edx/sanchez/ora2-deploy 
Updating ora2 requirements
 2014-04-01 12:50:07 -04:00
Dave St.Germain
1cd932c92b Fixes LMS-2474 by ensuring that readElts reads always reads an element 2014-04-01 11:57:42 -04:00
Greg Price
2a1ddab224 Improve inline discussion UI 
1. Add space between threads
2. Change Show/Hide to Expand/Collapse and visually separate it
3. Limit a thread to 700px high and scroll if longer

Co-authored-by: marco <marcotuts@gmail.com>
 2014-04-01 11:52:54 -04:00
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
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