Commits · 88d8813942e7b769337eac67f1af551bc2438e3f · edx / edx-platform · GitLab

02 Jun, 2014 9 commits
- Diacritic Plugin for Annotator Tool: Added studio input · 88d88139
  lduarte1991 committed Jun 02, 2014
  
  88d88139 Browse Files
- Diacritic Plugin for Annotator TooL: Added CSS and JS files · de5edcff
```
- UI Fixes for Diacritic Mark Plugin
```
  lduarte1991 committed Jun 02, 2014
  de5edcff Browse Files
- Merge pull request #3946 from edx/anton/i18n-code-response · ee368da6
```
CodeResponse: fix i18n.
```
  Anton Stupak committed Jun 02, 2014
  ee368da6 Browse Files
- Merge pull request #3895 from edx/anton/i18n-choice-text-response · 1a9f98b2
```
BLD-724: ChoiceTextResponse i18n.
```
  Anton Stupak committed Jun 02, 2014
  1a9f98b2 Browse Files
- Merge pull request #3755 from edx/waheed/lms2711-staff-debug-links-fixed-for-all-units · 141c1cd2
```
Fixed links for units loaded via ajax.
```
  Waheed Ahmed committed Jun 02, 2014
  141c1cd2 Browse Files
- Fixed links for units loaded via ajax. · cc36162d
```
LMS-2711
```
  Waheed Ahmed committed Jun 02, 2014
  cc36162d Browse Files
- Merge pull request #3852 from edx/waheed/lms2737-fix-staff-debug-info-links · e6a9047f
```
Fixed staff debug info endpoints for staff member.
```
  Waheed Ahmed committed Jun 02, 2014
  e6a9047f Browse Files
- Fixed staff debug info endpoints for staff member. · cb2af134
```
LMS-2737
```
  Waheed Ahmed committed Jun 02, 2014
  cb2af134 Browse Files
- BLD-724: ChoiceTextResponse i18n. · 73df5a93
  polesye committed Jun 02, 2014
  
  73df5a93 Browse Files
30 May, 2014 21 commits
- Merge pull request #3943 from edx/flowerhack/cleanup-opaque-keys · f683a4c5
```
Change Location, CourseLocator, etc to reference opaque-keys library
```
  Sarina Canelake committed May 30, 2014
  f683a4c5 Browse Files
- Change Location, CourseLocator, etc to reference opaque-keys library · 6ccb11f0
  Julia Hansbrough committed May 30, 2014
  
  6ccb11f0 Browse Files
- Merge pull request #3919 from edx/benpatterson/clean-up-rbenv · 049e9f0d
```
Ensure no old gems are left behind between test runs.
```
  Ben Patterson committed May 30, 2014
  049e9f0d Browse Files
- Merge pull request #3937 from edx/adam/remove-qualaroo-studio · e348ab9a
```
removes qualaroo from studio (STUD-1684)
```
  Adam committed May 30, 2014
  e348ab9a Browse Files
- Merge pull request #3932 from edx/dhm/bug_orphans · 77b8cbba
```
Delete orphans was trying to get non-existent 'draft' modulestore
```
  Don Mitchell committed May 30, 2014
  77b8cbba Browse Files
- Describe Python support for multi-line comments · c389746a
```
Added more details around Python's support for multi-line translator comments.
```
  Andy Armstrong committed May 30, 2014
  c389746a Browse Files
- 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
- Delete orphans was trying to get non-existent 'draft' modulestore · f0063d97
  Don Mitchell committed May 30, 2014
  
  f0063d97 Browse Files
- removes qualaroo from studio (STUD-1684) · 826aa455
  Adam Palay committed May 30, 2014
  
  826aa455 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
- Run bundle clean after bundle install · 1b67aebb
```
Running it beforehand was resulting in a corrupted state
if it was the first time bundle install was run.
```
  Ben Patterson committed May 30, 2014
  1b67aebb 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 10 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