Commits · 09d86c22819d06074a7a41ffe9e6b67683ffa6aa · edx / edx-platform · GitLab

14 Aug, 2014 16 commits
- Merge pull request #4832 from edx/hotfix/2014-08-14 · 09d86c22
```
Hotfix/2014 08 14
```
  Adam committed Aug 14, 2014
  09d86c22 Browse Files
- jquery.immediateDescendents cannot be loaded until jQuery is loaded. · b5aaf8b0
```
STUD-1999
```
  cahrens committed Aug 14, 2014
  b5aaf8b0 Browse Files
- Ignore errors on rmtree cleanup · eee0d35b
  Jesse Zoldak committed Aug 14, 2014
  
  eee0d35b Browse Files
- Verify loading indicator has been hidden. · 323a23f5
```
STUD-2090
```
  cahrens committed Aug 14, 2014
  323a23f5 Browse Files
- Merge pull request #4833 from edx/waheed/hotfix/2014-08-12 · 0edac154
```
Check REQUEST_CONTEXT.context exists before accessing it.
```
  Adam committed Aug 14, 2014
  0edac154 Browse Files
- Check REQUEST_CONTEXT.context exists before accessing it. · d9ccaa65
```
LMS-11226
```
  Waheed Ahmed committed Aug 14, 2014
  d9ccaa65 Browse Files
- Merge pull request #4827 from edx/ecom/include-optimizely · 1caa8cc4
```
Include Optimizely on the platform
```
  Renzo Lucioni committed Aug 14, 2014
  1caa8cc4 Browse Files
- Merge pull request #4826 from edx/sarina/jsme-hotfix · 9d4a28e9
```
Release edx-jsme 1.0
```
  Sarina Canelake committed Aug 14, 2014
  9d4a28e9 Browse Files
- Factor out Optimizely project ID · 3eaac3b8
  Renzo Lucioni committed Aug 14, 2014
  
  3eaac3b8 Browse Files
- Release edx-jsme 1.0 · db13868f
  Chris Rossi committed Aug 14, 2014
  
  db13868f Browse Files
- Merge pull request #4825 from edx/sarina/annotations-fixes · 3c6a3bac
```
Sarina/annotations fixes
```
  Sarina Canelake committed Aug 14, 2014
  3c6a3bac Browse Files
- Annotation Tools: Adding try-catch in case Annotator is missing from LMS · c5f85eff
  lduarte1991 committed Aug 14, 2014
  
  c5f85eff Browse Files
- Annotation Tools: Adding comments and adding CSS groups · c88bd159
  lduarte1991 committed Aug 14, 2014
  
  c88bd159 Browse Files
- Annotation Tools: Adding Annotator to CMS · e1987854
  lduarte1991 committed Aug 14, 2014
  
  e1987854 Browse Files
- - replaced tabs with 4 spaces · f2b34d80
```
 - fixed spaces after commas, if conditions, braces, operators
 - fixed some typecasting issues as well

 - added missing semicolons
```
  lduarte1991 committed Aug 14, 2014
  f2b34d80 Browse Files
- Annotation Tools: Explicit typecasting === changes and reorganizing plugins · a00a2de8
  lduarte1991 committed Aug 14, 2014
  
  a00a2de8 Browse Files
13 Aug, 2014 1 commit
- Merge pull request #4801 from edx/prof-ed-cherry-picked-changes · 9b53c809
```
hotfix-2014-08-12
```
  Julia Hansbrough committed Aug 13, 2014
  9b53c809 Browse Files
12 Aug, 2014 5 commits
- Consider profession ed courses as paid courses. · d60907d7
```
ECOM-63
```
  Diana Huang committed Aug 12, 2014
  d60907d7 Browse Files
- LMS: adding rendering/styling support for initial professional ed course types on student dashboard · 5caaec7b
  Brian Talbot committed Aug 12, 2014
  
  5caaec7b Browse Files
- Add integration tests for professional ed flow · 905ce631
  Will Daly committed Aug 12, 2014
  
  905ce631 Browse Files
- Adapt flow for new 'professional' mode. · 9aa095dd
```
ECOM-41
```
  Diana Huang committed Aug 12, 2014
  9aa095dd Browse Files
- Update redirect and wording for prof ed · 805c3256
```
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
```
  Julia Hansbrough committed Aug 12, 2014
  805c3256 Browse Files
11 Aug, 2014 2 commits
- Merge pull request #4775 from edx/alex/fix-reenable-user-partitions · ad37d93d
```
Reenable user partition in Advanced Settings.
```
  Christina Roberts committed Aug 11, 2014
  ad37d93d Browse Files
- Reenable user partition in Advanced Settings. · 96431203
  Alexander Kryklia committed Aug 11, 2014
  
  96431203 Browse Files
08 Aug, 2014 16 commits
- Merge pull request #4762 from edx/annotations-js-fix · d6522e52
```
Annotator Tools: Fix major logic bug in code (RC)
```
  Christina Roberts committed Aug 08, 2014
  d6522e52 Browse Files
- Merge pull request #4763 from edx/lms/add-optimizely · 37598e60
```
Lms/add optimizely
```
  Renzo Lucioni committed Aug 08, 2014
  37598e60 Browse Files
- Merge pull request #4764 from edx/diana/show-cert-without-end-date · 83f7acff
```
Show Certificates Before End
```
  Diana Huang committed Aug 08, 2014
  83f7acff Browse Files
- Merge pull request #4760 from edx/oleg/turn-off-cdn-rc · 562ec036
```
Allow turning off Video CDN in Studio.
```
  Christina Roberts committed Aug 08, 2014
  562ec036 Browse Files
- Add Optimizely widget · 2380235f
  Renzo Lucioni committed Aug 08, 2014
  
  2380235f Browse Files
- Annotator Tools: Fix major logic bug in code · 71e9f448
  lduarte1991 committed Aug 08, 2014
  
  71e9f448 Browse Files
- Allow turning off Video CDN in Studio. · 0577b9d8
```
BLD-1207
```
  Oleg Marshev committed Aug 08, 2014
  0577b9d8 Browse Files
- Move certificates_show_before_end into a new variable · 7865e2fb
```
Mark it as deprecated, but maintain backwards compatibility.

ECOM-11
```
  Diana Huang committed Aug 08, 2014
  7865e2fb Browse Files
- Merge pull request #4736 from edx/usman/lms11205-embargomiddleware-invalidkeyerror · 26b08a02
```
Catch InvalidKeyError in course_id_from_url().
```
  Adam committed Aug 08, 2014
  26b08a02 Browse Files
- Incomplete course ids should return a 404. · f9ee21f4
  Usman Khalid committed Aug 08, 2014
  
  f9ee21f4 Browse Files
- Merge pull request #4743 from edx/flowerhack/fix-upgrade-message · 1d64b50d
```
Basic fix for upgrade text bug
```
  Julia Hansbrough committed Aug 08, 2014
  1d64b50d Browse Files
- Merge pull request #4716 from edx/anton/studio-tooltip-manager · 5bf38806
```
Studio: Add tooltips.
```
  Anton Stupak committed Aug 08, 2014
  5bf38806 Browse Files
- Basic fix for upgrade text bug · 3de1ab83
  Julia Hansbrough committed Aug 08, 2014
  
  3de1ab83 Browse Files
- Merge pull request #4752 from edx/will/ora2-release-2014-08-08T13.47 · 6d263fe4
```
ORA2 release-2014-08-08T13.47
```
  Will Daly committed Aug 08, 2014
  6d263fe4 Browse Files
- Merge pull request #4744 from edx/clytwynec/remove_flaky_decorator_from_tests · 8c8d388d
```
removing "flaky" plugin, since it is not reporting failures properly
```
  clytwynec committed Aug 08, 2014
  8c8d388d Browse Files
- ORA2 release-2014-08-08T13.47 · 949c9656
  Will Daly committed Aug 08, 2014
  
  949c9656 Browse Files