Commits · 30815dba018430c2819321c47f953092f1406a8a · edx / edx-platform · GitLab

06 Jun, 2014 4 commits
- Merge pull request #3960 from edx/db/update-ddt · 30815dba
```
Update ddt to 0.8.0
```
  David Baumgold committed Jun 06, 2014
  30815dba Browse Files
- Merge pull request #3965 from edx/db/django-babel-underscore · 8dd4731d
```
Extract i18n strings from *.underscore files using django-babel-underscore
```
  David Baumgold committed Jun 06, 2014
  8dd4731d Browse Files
- Merge pull request #4013 from edx/zoldak/disable-cc-test · 210bffd4
```
Skip video cc test BLD-1115
```
  Jay Zoldak committed Jun 06, 2014
  210bffd4 Browse Files
- Skip video cc test BLD-1115 · d837cdc5
  Jay Zoldak committed Jun 06, 2014
  
  d837cdc5 Browse Files
05 Jun, 2014 14 commits
- Merge pull request #3997 from edx/benmcmorran/template-text-formatting · aca0971a
```
Reformats markdown problem templates avoid extra line breaks.
```
  benmcmorran committed Jun 05, 2014
  aca0971a Browse Files
- Merge pull request #3986 from edx/jsa/search-spell-correction · f5cfd1ef
```
Add support for search spell corrections to Forums UX.
```
  Jim Abramson committed Jun 05, 2014
  f5cfd1ef Browse Files
- Add support for search spell corrections to Forums UX. · 58c5066e
```
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
```
  jsa committed Jun 05, 2014
  58c5066e Browse Files
- Fixes spelling of Michigan in template. · 914f0f74
  Ben McMorran committed Jun 05, 2014
  
  914f0f74 Browse Files
- Revert "Fixes spelling of Michigan in template." · da6c3377
```
This reverts commit 9e9e69ac.
```
  Ben McMorran committed Jun 05, 2014
  da6c3377 Browse Files
- Fixes spelling of Michigan in template. · 9e9e69ac
  Ben McMorran committed Jun 05, 2014
  
  9e9e69ac Browse Files
- Merge pull request #3928 from edx/christina/custom-split-editor · da098987
```
Implement a custom editor for the split_module.
```
  Christina Roberts committed Jun 05, 2014
  da098987 Browse Files
- Reformats markdown problem templates avoid extra line breaks. · e18fd76d
  Ben McMorran committed Jun 05, 2014
  
  e18fd76d Browse Files
- Implement a custom editor for the split_module. · 5ab61fc4
```
STUD-1529
```
  cahrens committed Jun 05, 2014
  5ab61fc4 Browse Files
- Merge pull request #3988 from louyihua/django-babel-underscore · 8fffef77
```
Babel underscore extraction update according to @nedbat
```
  David Baumgold committed Jun 05, 2014
  8fffef77 Browse Files
- Merge pull request #3981 from edx/alex/fix_matlab_check · 2eae8b83
```
Improve escaping in code response.
```
  Alexander Kryklia committed Jun 05, 2014
  2eae8b83 Browse Files
- Merge pull request #3950 from edx/anton/transcript-editor-disable-validation · 4eab9cdb
```
Allow the video player to work with links with redirection.
```
  Anton Stupak committed Jun 05, 2014
  4eab9cdb Browse Files
- Babel underscore extraction update according to @nedbat · 12d8df97
```
1. Add underscore.po into the merge section in config.yaml
2. Using one babel command template to construct two babel commands
```
  louyihua committed Jun 05, 2014
  12d8df97 Browse Files
- BLD-1049: Allow the video player to work with redirected links. · 7b2d67f2
  polesye committed Jun 05, 2014
  
  7b2d67f2 Browse Files
04 Jun, 2014 14 commits
- Don't search for underscore files under lms · fa0dee17
  David Baumgold committed Jun 04, 2014
  
  fa0dee17 Browse Files
- Merge pull request #3707 from edx/db/release-script-no-duplicate-jira · 7228d41a
```
Don't show duplicate JIRA tickets in the release PR table
```
  David Baumgold committed Jun 04, 2014
  7228d41a Browse Files
- extract from underscore files under cms, lms, and common · ddfd50bb
```
to avoid extracting from test_root and such
```
  David Baumgold committed Jun 04, 2014
  ddfd50bb Browse Files
- Merge pull request #3971 from louyihua/django-babel-underscore · 126cf885
```
Django babel underscore
```
  David Baumgold committed Jun 04, 2014
  126cf885 Browse Files
- Merge pull request #3979 from edx/benmcmorran/delete-page-confirmation · 5dd7ffe7
```
Fixes delete page confirmation text.
```
  benmcmorran committed Jun 04, 2014
  5dd7ffe7 Browse Files
- Merge pull request #3977 from edx/zub/bugfix/std1691-IEeditannouncement · f19ad92d
```
prevent caching of GET requests for xblock student view
```
  zubair-arbi committed Jun 04, 2014
  f19ad92d Browse Files
- Merge pull request #3980 from edx/benmcmorran/remove-conrads-name · 6a893752
```
Removes Conrad's name from the course schedule settings (STUD-1511).
```
  benmcmorran committed Jun 04, 2014
  6a893752 Browse Files
- Don't show duplicate JIRA tickets in the release PR table · 4c4c2a17
  David Baumgold committed Jun 04, 2014
  
  4c4c2a17 Browse Files
- Fixes delete page confirmation text. · b5573603
  Ben McMorran committed Jun 04, 2014
  
  b5573603 Browse Files
- Merge pull request #3976 from edx/zoldak/skip-video-finish-time-test · e4d0b4d8
```
Skip intermittently failing video test
```
  Jay Zoldak committed Jun 04, 2014
  e4d0b4d8 Browse Files
- prevent caching of GET requests for xblock student view · dbd9e56c
```
STUD-1691
```
  zubair-arbi committed Jun 04, 2014
  dbd9e56c Browse Files
- Merge pull request #3940 from edx/zub/bugfix/std1679-sectionnameeditable · 74c482d6
```
make only section name in headers editable
```
  zubair-arbi committed Jun 04, 2014
  74c482d6 Browse Files
- make only section name in headers editable · 56e0b863
```
STUD-1679
```
  zubair-arbi committed Jun 04, 2014
  56e0b863 Browse Files
- Extract i18n strings from *.underscore files using django-babel-underscore · 644d4ac0
```
Change strings from mako.po into underscore.po, which is finally merged into djangojs.po.
```
  louyihua committed Jun 04, 2014
  644d4ac0 Browse Files
03 Jun, 2014 8 commits
- Merge pull request #3974 from edx/zoldak/fix-translation-tags · c08831b4
```
Fix some translation tags
```
  Jay Zoldak committed Jun 03, 2014
  c08831b4 Browse Files
- Skip intermittently failing video test · 32ed4e99
  Jay Zoldak committed Jun 03, 2014
  
  32ed4e99 Browse Files
- Merge pull request #3970 from edx/ahodges/documentation/DOC502 · 8ab61567
```
Ahodges/documentation/doc502
```
  Alison Hodges committed Jun 03, 2014
  8ab61567 Browse Files
- new section for June · feaff4bf
  Alison Hodges committed Jun 03, 2014
  
  feaff4bf Browse Files
- Removes Conrad's name from the course schedule settings (STUD-1511). · d592b7ee
  Ben McMorran committed Jun 03, 2014
  
  d592b7ee Browse Files
- Fix some translation tags · ac17e809
  Jay Zoldak committed Jun 03, 2014
  
  ac17e809 Browse Files
- Merge pull request #3941 from edx/gprice/handle-invalid-json · 6ab6b72c
```
Improve handling of bad JSON from comments service
```
  Greg Price committed Jun 03, 2014
  6ab6b72c Browse Files
- Merge pull request #3942 from edx/adam/protocol · a415b507
```
load js without specifying protocol
```
  Adam committed Jun 03, 2014
  a415b507 Browse Files