Commits · e1887d81cecd7f08e2f41dc19b23240eefe2b9bb · edx / edx-platform · GitLab

04 Apr, 2014 12 commits
- Merge pull request #3223 from edx/ahodges/documentation/spacing · e1887d81
```
Stray space made html file formatting incorrect
```
  Alison Hodges committed Apr 04, 2014
  e1887d81 Browse Files
- Merge pull request #2781 from edx/cdodge/password-history-enforcements · c407e898
```
Add some optional policies around password resets, such as password reus...
```
  chrisndodge committed Apr 04, 2014
  c407e898 Browse Files
- Stray space made html file formatting incorrect · 5f95d2a2
  Alison Hodges committed Apr 04, 2014
  
  5f95d2a2 Browse Files
- Merge pull request #2552 from edx/giulio/edit-in-cms-links · d2bac9bf
```
Add "View in Studio" links throughout LMS
```
  Giulio Gratta committed Apr 04, 2014
  d2bac9bf Browse Files
- Merge pull request #3184 from edx/frances/fix/lms-wiki-icons · 562875e6
```
Remove double icons on LMS wiki page
```
  frances botsford committed Apr 04, 2014
  562875e6 Browse Files
- Added "Edit in CMS" links throughout courseware · 3456c117
  Giulio Gratta committed Apr 04, 2014
  
  3456c117 Browse Files
- Merge pull request #3204 from edx/db/upgrade-django-nose · 6292e559
```
Upgrade django_nose to 1.2
```
  David Baumgold committed Apr 04, 2014
  6292e559 Browse Files
- Merge pull request #3195 from edx/anton/force-flash · 40d5f1e5
```
Force video player in flash mode.
```
  Anton Stupak committed Apr 04, 2014
  40d5f1e5 Browse Files
- BLD-958: Force video player in flash mode. · d5555470
  polesye committed Apr 04, 2014
  
  d5555470 Browse Files
- Merge pull request #3187 from edx/adam/fix-alter-xblock-student-state · da470afc
```
Adam/fix alter xblock student state
```
  Usman Khalid committed Apr 04, 2014
  da470afc Browse Files
- Merge pull request #3205 from edx/usman/lms2498-mako-template-tests · b3075e28
```
Test that TemplateLookup dirs are not cleared during lms startup
```
  Usman Khalid committed Apr 04, 2014
  b3075e28 Browse Files
- Merge pull request #3153 from edx/anton/caption_refactor · ec6388b8
```
Refactor video caption module.
```
  Anton Stupak committed Apr 04, 2014
  ec6388b8 Browse Files
03 Apr, 2014 28 commits
- Merge pull request #3164 from edx/flowerhack/better-xmodule-metrics · dd7bae43
```
XModule datadog metrics
```
  Julia Hansbrough committed Apr 03, 2014
  dd7bae43 Browse Files
- 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
- XModule datadog metrics · aa41635f
  Julia Hansbrough committed Apr 03, 2014
  
  aa41635f 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
- make sure new lms/tests.py file is run · 394e9efb
  Adam Palay committed Apr 03, 2014
  
  394e9efb Browse Files
- Test TemplateLookup dirs are not cleared during lms startup. · 12c2e1bf
```
LMS-2498
```
  Usman Khalid committed Apr 03, 2014
  12c2e1bf 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
- Upgrade django_nose to 1.2 · 17639222
  David Baumgold committed Apr 03, 2014
  
  17639222 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
- Refactor video caption module. · 2f572a86
  polesye committed Apr 03, 2014
  
  2f572a86 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