Commits · ed9ab3ad715a6a4c07440391486b8bc3303fabda · edx / edx-platform · GitLab

30 May, 2014 12 commits
- Merge pull request #3501 from edx/dcs/matlab-api-key · ed9ab3ad
```
Allow courses to set Matlab API key globally, in advanced settings.
```
  Dave St.Germain committed May 30, 2014
  ed9ab3ad Browse Files
- Merge pull request #3930 from edx/markhoeber/documentation/doc-446 · 2fd2eda6
```
Studio Welcome, Sign Up, and Sign In pages Help and text fixes
```
  Mark Hoeber committed May 30, 2014
  2fd2eda6 Browse Files
- Merge pull request #3926 from rocha/update-event-tracking-version · 8d84bfab
```
Updated version of event-tracking library to 0.1.0
```
  Carlos Andrés Rocha committed May 30, 2014
  8d84bfab Browse Files
- Merge pull request #3936 from edx/will/update-ease · ebbcf59f
```
Update EASE in edx-platform requirements
```
  Will Daly committed May 30, 2014
  ebbcf59f Browse Files
- Merge pull request #3907 from lduarte1991/lduarte-harvardx-image2 · 30dd47a6
```
Annotation Tools: Load Tinymce in student_view
```
  David Baumgold committed May 30, 2014
  30dd47a6 Browse Files
- Merge pull request #3933 from edx/andya/edit-container-fixes · 0a8b2649
```
Fix the title of edit modals from the unit page.
```
  Andy Armstrong committed May 30, 2014
  0a8b2649 Browse Files
- Merge pull request #3196 from mtyaka/enrollment-emails-http · 0c9d682d
```
Don't hardcode https protocol in enrollment emails.
```
  David Baumgold committed May 30, 2014
  0c9d682d Browse Files
- Update EASE in edx-platform requirements · 684c6fad
  Will Daly committed May 30, 2014
  
  684c6fad Browse Files
- Merge pull request #3917 from edx/oleg/add-span-tag-matlab · aeaddef3
```
Accept span tag from xqueue. BLD-1006.
```
  Oleg Marshev committed May 30, 2014
  aeaddef3 Browse Files
- Add span tag. · daf4840c
  Oleg Marshev committed May 30, 2014
  
  daf4840c Browse Files
- Merge pull request #3754 from theJohnnyBrown/empty-course-error · 0a30f24e
```
show a friendly message for an empty course rather than an error page
```
  Sarina Canelake committed May 29, 2014
  0a30f24e Browse Files
- Merge pull request #3929 from edx/sarina/lms-2786 · 5c9fe4bb
```
Fix location.url [LMS-2786]
```
  Sarina Canelake committed May 29, 2014
  5c9fe4bb Browse Files
29 May, 2014 28 commits
- Merge pull request #3931 from edx/sarina/fixup-external-opaque-keys-impls · 0f2b4cd2
```
Use external OpaqueKey implementations
```
  Sarina Canelake committed May 29, 2014
  0f2b4cd2 Browse Files
- Fix location.url [LMS-2786] · e77dffcb
  Sarina Canelake committed May 29, 2014
  
  e77dffcb Browse Files
- show a friendly message for an empty course rather than an error page · 0bd2286e
  Johnny Brown committed May 29, 2014
  
  0bd2286e Browse Files
- Fix the title of edit modals from the unit page. · 5792e7e0
  Andy Armstrong committed May 29, 2014
  
  5792e7e0 Browse Files
- Move to OpaqueKey implementations from the external library · cfcbdc01
```
[LMS-2757]
```
  Calen Pennington committed May 29, 2014
  cfcbdc01 Browse Files
- Merge pull request #3841 from edx/fix/large-email-queries-2 · b15f3f19
```
Fix/large email queries 2
```
  Adam committed May 29, 2014
  b15f3f19 Browse Files
- Merge pull request #3896 from edx/will/install-ease-and-requirements · e69749c9
```
Install EASE and requirements
```
  Will Daly committed May 29, 2014
  e69749c9 Browse Files
- Welcome page text edits · 97bc71bd
  Mark Hoeber committed May 29, 2014
  
  97bc71bd Browse Files
- Update help for welcome, register, and login pages · 714f4403
```
All now go to getting started, but have different tokens, for further
segmenting later.
```
  Mark Hoeber committed May 29, 2014
  714f4403 Browse Files
- Merge pull request #3927 from edx/ahodges/documentation/DOC438 · 85f1997f
```
corrected a typo; tried to clarify a different sentence
```
  Alison Hodges committed May 29, 2014
  85f1997f Browse Files
- Merge pull request #3882 from edx/ammar/test-youtube-availibility · 026c6523
```
Check YouTube Availability for Video Tests
```
  muhammad-ammar committed May 29, 2014
  026c6523 Browse Files
- corrected a typo; tried to clarify a different sentence · 7edcc2d1
  Alison Hodges committed May 29, 2014
  
  7edcc2d1 Browse Files
- Updated version of event-tracking library to 0.1.0 · a3360aa6
  Carlos Andrés Rocha committed May 29, 2014
  
  a3360aa6 Browse Files
- Merge pull request #3819 from edx/andya/edit-containers · 138cd459
```
Allow editing of container xblocks/xmodules
```
  Andy Armstrong committed May 29, 2014
  138cd459 Browse Files
- Merge pull request #3905 from edx/flowerhack/change-hardcoded-defaults · 172c6d15
```
Moved hardcoded defaults into settings
```
  Julia Hansbrough committed May 29, 2014
  172c6d15 Browse Files
- Allow editing of container xblocks/xmodules · 6b3e100c
```
STUD-1312
```
  Andy Armstrong committed May 29, 2014
  6b3e100c Browse Files
- Merge pull request #3717 from mitocw/cg/studio_addl_apps · 7cb241b8
```
Add ADDL_INSTALLED_APPS to studio for parity with lms
```
  Carson Gee committed May 29, 2014
  7cb241b8 Browse Files
- Merge pull request #3871 from edx/dcadams/fix_metrics_tab_after_opaque_keys · 1f0c1047
```
Fixes some stuff for metrics tab
```
  David Adams committed May 29, 2014
  1f0c1047 Browse Files
- Annotation Tools: Fixing tests for student_view · a4c912a0
```
Fixed typo from autocomplete

Fixed dict for tests
```
  lduarte1991 committed May 29, 2014
  a4c912a0 Browse Files
- Annotation Tools: Load Tinymce in student_view · 1d6f3c63
  lduarte1991 committed May 29, 2014
  
  1d6f3c63 Browse Files
- Check YouTube Availabitlity for Video Tests · 7afcb934
  Muhammad Ammar committed May 29, 2014
  
  7afcb934 Browse Files
- Add EASE to edx-platform requirements · e11cb4a3
  Will Daly committed May 29, 2014
  
  e11cb4a3 Browse Files
- Merge pull request #3920 from edx/zoldak/increase-test-async-timeout · 721732bf
```
Increase async script timeout in lettuce tests
```
  Jay Zoldak committed May 29, 2014
  721732bf Browse Files
- Merge pull request #3921 from edx/zoldak/increase-test-wait-for-default-timeout · e16fb6a6
```
Increase the default timeout for waiting in lettuce tests
```
  Jay Zoldak committed May 29, 2014
  e16fb6a6 Browse Files
- Merge pull request #3862 from cpennington/external-opaque-keys · 81d785d1
```
Extract opaque_keys into a separate library
```
  Calen Pennington committed May 29, 2014
  81d785d1 Browse Files
- Merge pull request #3893 from louyihua/tinymce-ie-fix · 502b285b
```
Make TinyMCE's HTML source code editor work under Internet Explorer
```
  David Baumgold committed May 29, 2014
  502b285b Browse Files
- Increase the default timeout for waiting in lettuce tests · 40884a50
  Jay Zoldak committed May 29, 2014
  
  40884a50 Browse Files
- Merge pull request #3909 from edx/ahodges/documentation/DOC362 · 6ddc3761
```
DOC-362, another set of students who don't get email
```
  Alison Hodges committed May 29, 2014
  6ddc3761 Browse Files