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

23776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
f45840acb5 Move .pep8 content to setup.cfg 2014-06-06 13:17:46 -04:00
David Baumgold
30815dba01 Merge pull request #3960 from edx/db/update-ddt 
Update ddt to 0.8.0
 2014-06-06 13:16:58 -04:00
David Baumgold
8dd4731d42 Merge pull request #3965 from edx/db/django-babel-underscore 
Extract i18n strings from *.underscore files using django-babel-underscore
 2014-06-06 10:36:12 -04:00
Jay Zoldak
210bffd44c Merge pull request #4013 from edx/zoldak/disable-cc-test 
Skip video cc test BLD-1115
 2014-06-06 09:42:13 -04:00
Jay Zoldak
d837cdc54f Skip video cc test BLD-1115 2014-06-06 09:25:22 -04:00
benmcmorran
aca0971a06 Merge pull request #3997 from edx/benmcmorran/template-text-formatting 
Reformats markdown problem templates avoid extra line breaks.
 2014-06-05 15:33:55 -04:00
Jim Abramson
f5cfd1ef96 Merge pull request #3986 from edx/jsa/search-spell-correction 
Add support for search spell corrections to Forums UX.
 2014-06-05 15:14:00 -04:00
jsa
58c5066e66 Add support for search spell corrections to Forums UX. 
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
 2014-06-05 15:00:29 -04:00
Ben McMorran
914f0f7415 Fixes spelling of Michigan in template. 2014-06-05 14:07:03 -04:00
Ben McMorran
da6c337702 Revert "Fixes spelling of Michigan in template." 
This reverts commit 9e9e69ace3.
 2014-06-05 14:03:49 -04:00
Ben McMorran
9e9e69ace3 Fixes spelling of Michigan in template. 2014-06-05 13:59:40 -04:00
Christina Roberts
da09898778 Merge pull request #3928 from edx/christina/custom-split-editor 
Implement a custom editor for the split_module.
 2014-06-05 12:55:09 -04:00
Ben McMorran
e18fd76d07 Reformats markdown problem templates avoid extra line breaks. 2014-06-05 12:54:39 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -04:00
David Baumgold
8fffef77f6 Merge pull request #3988 from louyihua/django-babel-underscore 
Babel underscore extraction update according to @nedbat
 2014-06-05 10:35:47 -04:00
Alexander Kryklia
2eae8b8380 Merge pull request #3981 from edx/alex/fix_matlab_check 
Improve escaping in code response.
 2014-06-05 15:59:28 +03:00
Anton Stupak
4eab9cdbe6 Merge pull request #3950 from edx/anton/transcript-editor-disable-validation 
Allow the video player to work with links with redirection.
 2014-06-05 11:10:52 +03:00
louyihua
12d8df970b Babel underscore extraction update according to @nedbat 
1. Add underscore.po into the merge section in config.yaml
2. Using one babel command template to construct two babel commands
 2014-06-05 15:22:40 +08:00
polesye
7b2d67f209 BLD-1049: Allow the video player to work with redirected links. 2014-06-05 09:34:54 +03:00
David Baumgold
fa0dee1754 Don't search for underscore files under lms 2014-06-04 13:43:05 -04:00
David Baumgold
7228d41aa9 Merge pull request #3707 from edx/db/release-script-no-duplicate-jira 
Don't show duplicate JIRA tickets in the release PR table
 2014-06-04 11:59:31 -04:00
David Baumgold
ddfd50bb13 extract from underscore files under cms, lms, and common 
to avoid extracting from test_root and such
 2014-06-04 11:58:05 -04:00
David Baumgold
126cf88504 Merge pull request #3971 from louyihua/django-babel-underscore 
Django babel underscore
 2014-06-04 11:49:54 -04:00
benmcmorran
5dd7ffe7e3 Merge pull request #3979 from edx/benmcmorran/delete-page-confirmation 
Fixes delete page confirmation text.
 2014-06-04 11:39:47 -04:00
zubair-arbi
f19ad92ddf Merge pull request #3977 from edx/zub/bugfix/std1691-IEeditannouncement 
prevent caching of GET requests for xblock student view
 2014-06-04 20:15:22 +05:00
benmcmorran
6a89375245 Merge pull request #3980 from edx/benmcmorran/remove-conrads-name 
Removes Conrad's name from the course schedule settings (STUD-1511).
 2014-06-04 11:00:25 -04:00
David Baumgold
4c4c2a17f4 Don't show duplicate JIRA tickets in the release PR table 2014-06-04 10:19:21 -04:00
Ben McMorran
b55736035a Fixes delete page confirmation text. 2014-06-04 09:39:17 -04:00
Jay Zoldak
e4d0b4d8e0 Merge pull request #3976 from edx/zoldak/skip-video-finish-time-test 
Skip intermittently failing video test
 2014-06-04 08:36:58 -04:00
zubair-arbi
dbd9e56c6c prevent caching of GET requests for xblock student view 
STUD-1691
 2014-06-04 16:14:13 +05:00
zubair-arbi
74c482d633 Merge pull request #3940 from edx/zub/bugfix/std1679-sectionnameeditable 
make only section name in headers editable
 2014-06-04 16:11:10 +05:00
zubair-arbi
56e0b86394 make only section name in headers editable 
STUD-1679
 2014-06-04 15:00:52 +05:00
louyihua
644d4ac008 Extract i18n strings from *.underscore files using django-babel-underscore 
Change strings from mako.po into underscore.po, which is finally merged into djangojs.po.
 2014-06-04 17:46:36 +08:00
Jay Zoldak
c08831b4b6 Merge pull request #3974 from edx/zoldak/fix-translation-tags 
Fix some translation tags
 2014-06-03 18:15:21 -04:00
Jay Zoldak
32ed4e9973 Skip intermittently failing video test 2014-06-03 18:13:25 -04:00
Alison Hodges
8ab61567f5 Merge pull request #3970 from edx/ahodges/documentation/DOC502 
Ahodges/documentation/doc502
 2014-06-03 17:26:23 -04:00
Alison Hodges
feaff4bfe4 new section for June 2014-06-03 17:25:52 -04:00
Ben McMorran
d592b7eec1 Removes Conrad's name from the course schedule settings (STUD-1511). 2014-06-03 16:58:05 -04:00
Jay Zoldak
ac17e809ee Fix some translation tags 2014-06-03 15:50:11 -04:00
Greg Price
6ab6b72c86 Merge pull request #3941 from edx/gprice/handle-invalid-json 
Improve handling of bad JSON from comments service
 2014-06-03 14:13:29 -04:00
Adam
a415b507d0 Merge pull request #3942 from edx/adam/protocol 
load js without specifying protocol
 2014-06-03 14:09:20 -04:00
Will Daly
b700dc0cca Merge pull request #3939 from edx/will/ora2-ai-grading-settings 
ORA2 AI Grading Settings
 2014-06-03 14:06:47 -04:00
Greg Price
dc2342859e Improve handling of bad JSON from comments service 
Instead of allowing the JSONDecodeError to escape, raise an error
indicating the request id and containing the first 100 characters
of the response to aid investigation.
 2014-06-03 13:34:36 -04:00
Alison Hodges
31843fd324 Change log 2014-06-03 12:47:32 -04:00
Piotr Mitros
2f3e76721b Merge pull request #3935 from edx/pmitros/adding-audio-done-xblocks 
Added prototype DoneXBlock and AudioXBlock
 2014-06-03 12:47:28 -04:00
Ben Patterson
2795f85c57 Merge pull request #3964 from edx/benpatterson/auto-docs-builds 
Allow consumption of environment variables in docs Makefiles
 2014-06-03 12:46:21 -04:00
Alison Hodges
488bbff802 Added image, completed draft 2014-06-03 12:33:53 -04:00
Alexander Kryklia
97e8f94379 Improve escaping in code response. 2014-06-03 18:56:36 +03:00
Will Daly
5f7520e121 Add AI algorithm configuration to LMS settings 
Added ORA2_FILE_PREFIX setting
 2014-06-03 11:49:56 -04:00
Piotr Mitros
5bf5766da4 Code review changes from Ned+Cale 2014-06-03 11:18:02 -04:00