Commits · f02093f010381f3afb3bf0f71b5f2c116dfac05a · edx / edx-platform · GitLab

13 Aug, 2014 9 commits
- 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
- 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
- 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 26 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
- Merge pull request #4783 from edx/ahodges/documentation/relnotes08_12_14 · 4c065eb6
```
Release notes - 8/12/14
```
  Mark Hoeber committed Aug 12, 2014
  4c065eb6 Browse Files
- Release Notes for 8/12/14 · 927a55f4
  Alison Hodges committed Aug 12, 2014
  
  927a55f4 Browse Files
- Merge pull request #4237 from starteam/master · 7e9f917f
```
Fix for empty imsx_messageIdentifier
```
  Oleg Marshev committed Aug 12, 2014
  7e9f917f Browse Files
- Merge pull request #4356 from edx/markhoeber/documentation/publishing-changes · 4e8a2902
```
WIP: Documentation for Publishing Changes
```
  Mark Hoeber committed Aug 12, 2014
  4e8a2902 Browse Files
- Merge pull request #4781 from edx/christina/publishing-tests · 620d3102
```
Improve stability of test_studio_outline tests.
```
  Christina Roberts committed Aug 12, 2014
  620d3102 Browse Files
- Merge pull request #4785 from edx/adam/add-link-to-readme · 8e722af0
```
add how to file a bug report link to readme
```
  Adam committed Aug 12, 2014
  8e722af0 Browse Files
- Merge pull request #4638 from edx/zoldak/lettuce-log-js-console · ab78c758
```
Capture console log on lettuce test failure
```
  Jesse Zoldak committed Aug 12, 2014
  ab78c758 Browse Files
- Fix for empty imsx_messageIdentifier · be17040f
  Ivica Ceraj committed Aug 12, 2014
  
  be17040f Browse Files
- Doc changes for new publishing workflow · b7486133
  Mark Hoeber committed Aug 11, 2014
  
  b7486133 Browse Files
11 Aug, 2014 5 commits
- Merge pull request #4773 from edx/ahodges/documentation/DOC804 · 41425a46
```
Ahodges/documentation/doc804
```
  Alison Hodges committed Aug 11, 2014
  41425a46 Browse Files
- Merge pull request #3227 from FiloSottile/enforce_type · 25963797
```
Enforce type of the XBlocks Fields when set
```
  Calen Pennington committed Aug 11, 2014
  25963797 Browse Files
- Updates for Sylvia's edits · 83f1231f
  Alison Hodges committed Aug 11, 2014
  
  83f1231f Browse Files
- Merge pull request #4766 from edx/flowerhack/update-testing-md · df83f527
```
Update testing.md
```
  Julia Hansbrough committed Aug 11, 2014
  df83f527 Browse Files
- add how to file a bug report link to readme · 77209699
  Adam Palay committed Aug 11, 2014
  
  77209699 Browse Files