Commits · 19ca6c845c622374738a84ba959abc99c79765cd · edx / edx-platform · GitLab

14 Aug, 2014 10 commits
- Minor i18n fixes prompted by translators · 19ca6c84
  Sarina Canelake committed Aug 14, 2014
  
  19ca6c84 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 #4823 from lduarte1991/lduarte-harvardx-pr19 · 244554f7
```
Annotation Tools: Adding Annotator to CMS
```
  Sarina Canelake committed Aug 14, 2014
  244554f7 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 13 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
- jquery.immediateDescendents cannot be loaded until jQuery is loaded. · 1272f049
```
STUD-1999
```
  cahrens committed Aug 13, 2014
  1272f049 Browse Files
- - replaced tabs with 4 spaces · 63f1d983
```
 - fixed spaces after commas, if conditions, braces, operators
 - fixed some typecasting issues as well

 - added missing semicolons
```
  lduarte1991 committed Aug 13, 2014
  63f1d983 Browse Files
- Documentation: create_sinon.js - update referenced JIRA issue. · 7234d39b
  Tim Babych committed Aug 13, 2014
  
  7234d39b Browse Files
- Merge pull request #4759 from edx/dhm/key_munging · 5789b98b
```
Remove hardcoding of key syntax for base url
```
  Don Mitchell committed Aug 13, 2014
  5789b98b Browse Files
- Merge pull request #4791 from edx/talbs/studio-stylesweep-fontsize · 681438f0
```
Studio: Refactoring font-size CSS rules to use Sass mixins/placeholders
```
  Brian Talbot committed Aug 13, 2014
  681438f0 Browse Files
- Studio: refactoring font-size to use existing Sass scale-based placeholders · 998e33ec
  Brian Talbot committed Aug 13, 2014
  
  998e33ec Browse Files
- Studio: refactoring font-size to use Sass mixin · 1720ddf9
```
* moving font-size to use @include font-size() mixin
* re-organizing vendor reset styling into _vendor.scss override rather than _reset.scss
* initial rule re-organization and minor line-height tweaks
```
  Brian Talbot committed Aug 12, 2014
  1720ddf9 Browse Files
12 Aug, 2014 17 commits
- Merge pull request #4798 from edx/zoldak/rmtree-cleanup · 2edf1aef
```
Ignore errors on rmtree cleanup
```
  Jesse Zoldak committed Aug 12, 2014
  2edf1aef Browse Files
- Merge pull request #4802 from edx/will/unit-test-staticfiles · 680d5031
```
Unit tests don't need assets
```
  Will Daly committed Aug 12, 2014
  680d5031 Browse Files
- Merge pull request #4795 from edx/zoldak/clean-mako-dir · 9f1779ed
```
Clean out the mako temp dirs before running tests
```
  Jesse Zoldak committed Aug 12, 2014
  9f1779ed Browse Files
- Merge pull request #4797 from edx/lms/add-optimizely · 563b62a8
```
Factor out Optimizely project ID
```
  Renzo Lucioni committed Aug 12, 2014
  563b62a8 Browse Files
- Remove update assets from unit test suite · a827df27
```
Update settings so unit tests pass
```
  Will Daly committed Aug 12, 2014
  a827df27 Browse Files
- 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
- Factor out Optimizely project ID · 2ad95574
  Renzo Lucioni committed Aug 12, 2014
  
  2ad95574 Browse Files
- Merge branch 'release' from 2014-08-12 release. · ee836d4c
  cahrens committed Aug 12, 2014
  
  ee836d4c Browse Files
- Merge pull request #4790 from edx/talbs/studio-stylesweep-fontweight · e727bd22
```
Studio: Refactoring font-weight CSS rules to use Sass placeholders
```
  Brian Talbot committed Aug 12, 2014
  e727bd22 Browse Files
- Studio: refactoring font-weight CSS rules to use Sass placeholders · f8ec9294
  Brian Talbot committed Aug 12, 2014
  
  f8ec9294 Browse Files
- Ignore errors on rmtree cleanup · 9a25c9ff
  Jesse Zoldak committed Aug 12, 2014
  
  9a25c9ff Browse Files
- Merge pull request #4768 from edx/sarina/remove-legacy-banner · d9a2d229
```
Remove banner from instructor dashboard
```
  Sarina Canelake committed Aug 12, 2014
  d9a2d229 Browse Files
- Clean out the mako temp dirs before running tests · e399c0b1
  Jesse Zoldak committed Aug 12, 2014
  
  e399c0b1 Browse Files