Commits · dfed60fa8c32102c67b7f0d9daf39efe8eb6f042 · edx / edx-platform · GitLab

03 Apr, 2014 24 commits
- Merge pull request #3163 from edx/christina/advanced-settings-font · dfed60fa
```
Use monospaced font for CodeMirror editor.
```
  Christina Roberts committed Apr 03, 2014
  dfed60fa Browse Files
- Use monospaced font for CodeMirror editor. · 3d7915fa
```
Cursor position gets off with non-monospaced font.
STUD-1456.

Vertical alignment of monospace font in advanced settings via position css adjustment
```
  cahrens committed Apr 03, 2014
  3d7915fa Browse Files
- Merge pull request #3189 from edx/db/upgrade-pyparsing · 63c58bb2
```
Upgrade pyparsing to 2.0.1
```
  David Baumgold committed Apr 03, 2014
  63c58bb2 Browse Files
- Merge remote-tracking branch 'origin/release' · 751bd71a
  Stephen Sanchez committed Apr 03, 2014
  
  751bd71a Browse Files
- Merge pull request #3172 from edx/markhoeber/documentation/doc-248 · 9e00d6f0
```
Release notes for 4/2/14
```
  Mark Hoeber committed Apr 03, 2014
  9e00d6f0 Browse Files
- Merge pull request #3180 from edx/christina/iframe_binding_bug · d6a0d6f0
```
Check iframe src for the specific value TinyMCE uses.
```
  Christina Roberts committed Apr 03, 2014
  d6a0d6f0 Browse Files
- Merge pull request #3177 from edx/dcs/paver-one-watcher · c202e2aa
```
Fixes potential 'too many open files error' when running all servers.
```
  Dave St.Germain committed Apr 03, 2014
  c202e2aa Browse Files
- Release notes for 4/2/14 · 6dc4640f
```
DOC-248
```
  Mark Hoeber committed Apr 03, 2014
  6dc4640f Browse Files
- Merge pull request #3150 from edx/waheed/stud1483-cannot-handle-more-than-9-lines-advanced-settings · 04896287
```
Fixed studio can't handle more than 9 lines in advanced settings.
```
  zubair-arbi committed Apr 03, 2014
  04896287 Browse Files
- Merge pull request #3078 from edx/markhoeber/documentation/stud-1443 · 4be9c06d
```
Documentation for Pages and Wiki changes
```
  Mark Hoeber committed Apr 03, 2014
  4be9c06d Browse Files
- Documentation for Pages and Wiki changes · 0a8d07c0
```
STUD-1443
```
  Mark Hoeber committed Apr 03, 2014
  0a8d07c0 Browse Files
- Merge pull request #3181 from edx/zoldak/fix-acid · b0859941
```
Add synchronization for rendering to studio xblock tests
```
  Jay Zoldak committed Apr 03, 2014
  b0859941 Browse Files
- Merge pull request #3201 from edx/alex/fix_971 · 70db47a7
```
Fix flaky video test #21: increase timeout.
```
  Alexander Kryklia committed Apr 03, 2014
  70db47a7 Browse Files
- Merge pull request #3169 from edx/alex/fix_more_flaky_tests · 668134de
```
Alex/fix more flaky tests
```
  Alexander Kryklia committed Apr 03, 2014
  668134de Browse Files
- Merge pull request #3136 from edx/alex/display_native_language_2 · 41695def
```
Alex/display native language 2
```
  Alexander Kryklia committed Apr 03, 2014
  41695def Browse Files
- Fix flaky video tests: speed up youtube api loading and wait for controls. · cf3e2c86
  Alexander Kryklia committed Apr 03, 2014
  
  cf3e2c86 Browse Files
- Fix flaky video test #21: increase timeout. · 221f4e23
  Alexander Kryklia committed Apr 03, 2014
  
  221f4e23 Browse Files
- Merge pull request #3199 from edx/alex/fix_flaky_video_test_20 · fab43e1a
```
Alex/fix flaky video test 20
```
  Alexander Kryklia committed Apr 03, 2014
  fab43e1a Browse Files
- Merge pull request #3198 from edx/alex/fix_flaky_video_test_12 · e3902cbe
```
Fix flaky test #12
```
  Alexander Kryklia committed Apr 03, 2014
  e3902cbe Browse Files
- Fix lms video #20: scroll view to be clickable. · c3f99438
  Alexander Kryklia committed Apr 03, 2014
  
  c3f99438 Browse Files
- Fix flaky test #12 · 2a39d283
```
"CC button works correctly w/o english transcript in HTML5 mode of Video component"
```
  Alexander Kryklia committed Apr 03, 2014
  2a39d283 Browse Files
- Merge pull request #3149 from edx/alex/fix_flaky_test · 80635a99
```
Fix flaky acceptance test.
```
  Alexander Kryklia committed Apr 03, 2014
  80635a99 Browse Files
- Merge pull request #3192 from edx/ned/fix-encode-error-when-hashing-resources · 11d078a9
```
Fix hash_resource to avoid encode errors.
```
  Ned Batchelder committed Apr 02, 2014
  11d078a9 Browse Files
- Fix hash_resource to avoid encode errors. · 732bf3f3
  Ned Batchelder committed Apr 02, 2014
  
  732bf3f3 Browse Files
02 Apr, 2014 16 commits
- Merge pull request #3165 from edx/markhoeber/documentation/doc-188 · f275f542
```
Initial Reorg of Setting up Course
```
  Mark Hoeber committed Apr 02, 2014
  f275f542 Browse Files
- Reorganizatio of Setting up Course · 69ed9984
```
DOC-188
```
  Mark Hoeber committed Apr 02, 2014
  69ed9984 Browse Files
- Merge pull request #3178 from edx/ned/private-requirements-in-paver · bda1471c
```
Paver should install requirements/private.txt
```
  Ned Batchelder committed Apr 02, 2014
  bda1471c Browse Files
- Merge pull request #3170 from edx/valera/remove_ipython_dependent_methods · 65a9ce24
```
Remove a method call which depends on IPython.
```
  Valera Rozuvan committed Apr 02, 2014
  65a9ce24 Browse Files
- Upgrade pyparsing to 2.0.1 · cb5e3c81
  David Baumgold committed Apr 02, 2014
  
  cb5e3c81 Browse Files
- Merge pull request #3186 from edx/sanchez/update_ora2_hash · eb4096f1
```
Updating the hash of the ORA2 release candidate in the requirements
```
  Stephen Sanchez committed Apr 02, 2014
  eb4096f1 Browse Files
- Updating the hash of the ORA2 release candidate in the requirements · e6e818a5
  Stephen Sanchez committed Apr 02, 2014
  
  e6e818a5 Browse Files
- Merge pull request #3179 from cpennington/problem-check-metrics · af486423
```
Rename metrics so that we capture checks as well as scores and number of attempts
```
  Calen Pennington committed Apr 02, 2014
  af486423 Browse Files
- Merge pull request #3155 from edx/christina/tinymce-update-cdn2 · 269cd19a
```
Upgrade TinyMCE to 4.0.20 and replaced tabbed HTML editor
```
  Christina Roberts committed Apr 02, 2014
  269cd19a Browse Files
- Add synchronization for rendering to studio xblock tests · 86cfda32
  Jay Zoldak committed Apr 02, 2014
  
  86cfda32 Browse Files
- Check iframe src for the specific value TinyMCE uses. · cc275a93
```
STUD-1470
```
  cahrens committed Apr 02, 2014
  cc275a93 Browse Files
- Merge pull request #3116 from edx/ahodges/documentation/launching · 42a1f6e3
```
Ahodges/documentation/launching
```
  Mark Hoeber committed Apr 02, 2014
  42a1f6e3 Browse Files
- Initial draft and images for LMS-2381 · e79cc796
  Alison Hodges committed Apr 02, 2014
  
  e79cc796 Browse Files
- Merge pull request #3147 from mtyaka/password-reset-email-http · 092d6201
```
Don't hardcode https protocol in password reset email.
```
  David Baumgold committed Apr 02, 2014
  092d6201 Browse Files
- Remove a method call which depends on IPython. · 638da490
```
Because IPython is not part of edx-platform dependencies, the
method assert_in has to be defined.
```
  Valera Rozuvan committed Apr 02, 2014
  638da490 Browse Files
- Merge pull request #3176 from edx/hotfix/revert-openended-i18n · ca7ada62
```
Revert "Open ended panel headings not internationalized."
```
  Stephen Sanchez committed Apr 02, 2014
  ca7ada62 Browse Files