Commits · f3a0327541209d584d0908bf004407a7b41ab3d3 · edx / edx-platform · GitLab

14 Aug, 2014 34 commits
- Merge pull request #4841 from edx/sarina/minor-i18n-fixes · f3a03275
```
Minor i18n fixes prompted by translators
```
  Sarina Canelake committed Aug 14, 2014
  f3a03275 Browse Files
- Merge pull request #4844 from edx/release · c830537e
```
Release
```
  Adam committed Aug 14, 2014
  c830537e Browse Files
- Merge pull request #4832 from edx/hotfix/2014-08-14 · 09d86c22
```
Hotfix/2014 08 14
```
  Adam committed Aug 14, 2014
  09d86c22 Browse Files
- Merge pull request #3784 from mtyaka/patch-1 · 5c64c5b2
```
Update django-splash.
```
  Feanil Patel committed Aug 14, 2014
  5c64c5b2 Browse Files
- Minor i18n fixes prompted by translators · 19ca6c84
  Sarina Canelake committed Aug 14, 2014
  
  19ca6c84 Browse Files
- Merge pull request #4818 from edx/jhelbert/contributing-generalization · 963f77e4
```
Generalizing CONTRIBUTING.rst to all repos
```
  jhelbert committed Aug 14, 2014
  963f77e4 Browse Files
- Generalizing CONTRIBUTING.rst to all repos · 260aa88c
  Justin Helbert committed Aug 14, 2014
  
  260aa88c 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
- Update django-splash. · 16a29409
```
The new release supports wildcards in path exclusion rules.
```
  Matjaz Gregoric committed Aug 14, 2014
  16a29409 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 #4735 from edx/oleg/validate-content-experiments · 2ca86a8d
```
BLD-1125: Validate content experiments after managing a group.
```
  Oleg Marshev committed Aug 14, 2014
  2ca86a8d Browse Files
- BLD-1125: Validation of content experiments after managing a group. · a94e9424
  Oleg Marshev committed Aug 14, 2014
  
  a94e9424 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 #4586 from jazkarta/edx-jsme-1.0 · 6dd9d9ec
```
Release edx-jsme 1.0
```
  Sarina Canelake committed Aug 14, 2014
  6dd9d9ec Browse Files
- Merge pull request #4625 from fmyzjs/ipv6 · c285bda6
```
Support ipv6 in geoinfo and Embargo
```
  Sarina Canelake committed Aug 14, 2014
  c285bda6 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
- Merge pull request #4823 from lduarte1991/lduarte-harvardx-pr19 · 244554f7
```
Annotation Tools: Adding Annotator to CMS
```
  Sarina Canelake committed Aug 14, 2014
  244554f7 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
- Merge pull request #4808 from edx/tim/open-STUD-1264 · c12ed3ae
```
Documentation: create_sinon.js - update referenced JIRA issue.
```
  Tim Babych committed Aug 14, 2014
  c12ed3ae Browse Files
- Support ipv6 in geoinfo and Embargo · 13846e07
  Jason Zhu committed Aug 14, 2014
  
  13846e07 Browse Files
- Annotation Tools: Adding try-catch in case Annotator is missing from LMS · 76b8891b
  lduarte1991 committed Aug 13, 2014
  
  76b8891b Browse Files
- Annotation Tools: Adding comments and adding CSS groups · 8cfdb8f1
  lduarte1991 committed Aug 13, 2014
  
  8cfdb8f1 Browse Files
- Annotation Tools: Adding Annotator to CMS · 5c859c71
  lduarte1991 committed Aug 13, 2014
  
  5c859c71 Browse Files
- Merge pull request #4796 from lduarte1991/lduarte-harvardx-pr18 · 76516f52
```
Annotation Tools: Fixing implicit typecasting and reordering plugins
```
  Sarina Canelake committed Aug 13, 2014
  76516f52 Browse Files
13 Aug, 2014 6 commits
- Merge pull request #4814 from edx/christina/bug-2090 · c389a445
```
Verify loading indicator has been hidden.
```
  Christina Roberts committed Aug 13, 2014
  c389a445 Browse Files
- Merge pull request #4819 from edx/minimaster · f02093f0
```
Resolving merge conflict between master and release
```
  Julia Hansbrough committed Aug 13, 2014
  f02093f0 Browse Files
- Fixed merge conflict between release and master. · 2204eb73
  Julia Hansbrough committed Aug 13, 2014
  
  2204eb73 Browse Files
- Verify loading indicator has been hidden. · a35cbf1c
```
STUD-2090
```
  cahrens committed Aug 13, 2014
  a35cbf1c Browse Files
- Merge pull request #4815 from edx/christina/bug-1999 · 7e975f78
```
jquery.immediateDescendents cannot be loaded until jQuery is loaded.
```
  Christina Roberts committed Aug 13, 2014
  7e975f78 Browse Files
- 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