Commits · c202e2aa6fb297824e519d29ce00f695c0325f48 · edx / edx-platform · GitLab

03 Apr, 2014 17 commits
- 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
- 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 23 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
- 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
- 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
- Rename metrics so that we capture checks as well as scores and number of attempts · 7e23e265
  Calen Pennington committed Apr 02, 2014
  
  7e23e265 Browse Files
- Paver should install requirements/private.txt · beb1d740
  Ned Batchelder committed Apr 02, 2014
  
  beb1d740 Browse Files
- Fixes potential 'too many open files error' when running all servers. · 7d38c493
  Dave St.Germain committed Apr 02, 2014
  
  7d38c493 Browse Files
- Match our default code editor font size of 13. · e4de5d2e
  cahrens committed Apr 02, 2014
  
  e4de5d2e Browse Files
- Studio: syncing up font-based styling between TinyMCE editing view and Studio HTML xmodule preview · 473ed4cc
```
Separating and documenting tinyMCE font imports from customized vendor code and customized render styling css files (because font must load first in iframe).

Add the TinyMCE font file to the CMS pipeline.
```
  Brian Talbot committed Apr 02, 2014
  473ed4cc Browse Files
- Update default font size to 14 for bulk e-mail editor (LMS). · b04a0d99
  cahrens committed Apr 02, 2014
  
  b04a0d99 Browse Files
- revising default (minified) TinyMCE content CSS to be scoped to .mce-content-body element · cc15a267
  Brian Talbot committed Apr 02, 2014
  
  cc15a267 Browse Files
- scoping TinyMCE editing CSS to just tinyMCE context-based elements · 6443486d
  Brian Talbot committed Apr 02, 2014
  
  6443486d Browse Files
- Directions for creating codemirror-compressed.js · 9d9b2b8e
  cahrens committed Apr 02, 2014
  
  9d9b2b8e Browse Files
- Add dialog plugin code to compressed JS file and CSS file. · aaf842f8
```
Needed for TinyMCE CodeMirror plugin.
```
  cahrens committed Apr 02, 2014
  aaf842f8 Browse Files
- removing tinymce button border only on active to counteract fun LMS button styles · 786b416b
  Frances Botsford committed Apr 02, 2014
  
  786b416b Browse Files
- Tiny MCE version 4.0.20 · f44a1b6c
```
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
```
  Nimisha Asthagiri committed Apr 02, 2014
  f44a1b6c Browse Files