Commits · c9f8682a27280598d59fb72f7e42b2a52607aa40 · edx / edx-platform

18 Mar, 2016 5 commits
- Merge pull request #11832 from edx/muddasser/lettuce/cms/course_export · c9f8682a
```
Covered in bokchoy at studio/test_import_export.py:TestCourseBadExport 
```
  Muddasser committed Mar 18, 2016
  c9f8682a Browse Files
- Merge pull request #11833 from edx/muddasser/lettuce/cms/courses · ba4e9ee3
```
Partially covered in bokchoy at studio/test_studio_course_create.py:CreateCourseTest 
```
  Muddasser committed Mar 18, 2016
  ba4e9ee3 Browse Files
- Merge pull request #11836 from edx/muddasser/lettuce/cms/component.feature · f3a0c58a
```
Partially covered in bokchoy at studio/test_studio_container.py:EditContainerTest and studio/test_studio_container.py:DisplayNameTest
```
  Muddasser committed Mar 18, 2016
  f3a0c58a Browse Files
- Merge pull request #11791 from edx/raees/testing-one-feature-file · 8343bd4e
```
Testing feature file
```
  raeeschachar committed Mar 18, 2016
  8343bd4e Browse Files
- Merge pull request #11848 from edx/release · ec57ee02
```
Release
```
  Adam committed Mar 17, 2016
  ec57ee02 Browse Files
17 Mar, 2016 14 commits
- Merge pull request #11842 from edx/hotfix/2016-03-17 · 6860366d
```
Revert "Make Capa problems do initial load without AJAX."
```
  Adam committed Mar 17, 2016
  6860366d Browse Files
- Merge pull request #11843 from edx/clintonb/login-a11y · ebefd0d2
```
Fixed accessibility issues with password reset
```
  Clinton Blackburn committed Mar 17, 2016
  ebefd0d2 Browse Files
- Fixed accessibility issues with password reset · 6ad750a1
```
ECOM-3938
```
  Clinton Blackburn committed Mar 17, 2016
  6ad750a1 Browse Files
- Merge pull request #11835 from edx/ned/updated-translations · 2536c589
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Mar 17, 2016
  2536c589 Browse Files
- Revert "Make Capa problems do initial load without AJAX." · b8b7327e
```
This reverts commit 9984bbc2.
```
  David Ormsbee committed Mar 17, 2016
  b8b7327e Browse Files
- Merge pull request #11411 from edx/benp/shard2-lms · 4660055e
```
Create a third shard for lms unit tests.
```
  Ben Patterson committed Mar 17, 2016
  4660055e Browse Files
- Merge pull request #11818 from open-craft/omar/problem-builder · 8aff51bf
```
Update problem-builder to version 2.0.3
```
  Braden MacDonald committed Mar 17, 2016
  8aff51bf Browse Files
- Create a third shard for lms unit tests. · c504029b
```
This will leverage the nose attrib plugin to allow us
to break tests apart on our build system to run
in parallel on separate nodes.
```
  Ben Patterson committed Mar 17, 2016
  c504029b Browse Files
- Removed annotatable.feature and events.feature and related py files · 792bca88
  raeeschachar committed Mar 17, 2016
  
  792bca88 Browse Files
- Removed duplicate lettuce test from component.feature · cb0bb1f4
  Muddasser committed Mar 17, 2016
  
  cb0bb1f4 Browse Files
- Update translations (autogenerated message) · 6883f215
  Ned Batchelder committed Mar 17, 2016
  
  6883f215 Browse Files
- Removed duplicate luttuce test from courses.feature · 83238114
  Muddasser committed Mar 17, 2016
  
  83238114 Browse Files
- Removed duplicate lettuce test from course-export.feature · 079742d6
  Muddasser committed Mar 17, 2016
  
  079742d6 Browse Files
- Merge pull request #11824 from edx/release · 9b8ff773
```
Merge release back to master.
```
  Toby Lawrence committed Mar 16, 2016
  9b8ff773 Browse Files
16 Mar, 2016 10 commits
- Merge pull request #11813 from edx/andya/upgrade-requirejs · 7ead068a
```
Upgrade RequireJS
```
  Andy Armstrong committed Mar 16, 2016
  7ead068a Browse Files
- Merge pull request #11822 from edx/zoldak/revert-pr11613 · f01f36a5
```
Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
```
  Jesse Zoldak committed Mar 16, 2016
  f01f36a5 Browse Files
- Merge pull request #11786 from edx/peter-fogg/course-home-a11y · 954504d7
```
Accessibility fixes for the course home page.
```
  Peter Fogg committed Mar 16, 2016
  954504d7 Browse Files
- Upgrade RequireJS · 06daf79b
```
FEDX-105
```
  Andy Armstrong committed Mar 16, 2016
  06daf79b Browse Files
- Merge pull request #11793 from edx/rc/2016-03-16 · 3d95bd54
```
Release Candidate rc/2016-03-16
```
  Toby Lawrence committed Mar 16, 2016
  3d95bd54 Browse Files
- Merge pull request #11817 from edx/diana/hide-video-error · 9242d97b
```
Use is-hidden instead of hidden for video errors.
```
  Diana Huang committed Mar 16, 2016
  9242d97b Browse Files
- Merge pull request #11823 from edx/releng/revert-ecom-2947 · cac35ee2
```
Revert ECOM-2947.
```
  Toby Lawrence committed Mar 16, 2016
  cac35ee2 Browse Files
- Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming" · f891d27c
```
This reverts commit 954dae58.
```
  Jesse Zoldak committed Mar 16, 2016
  f891d27c Browse Files
- Revert "Fixed the other half of forgot password flow accourding to logistration." · a32ee429
```
This reverts commit 178f5a60.
```
  Toby Lawrence committed Mar 16, 2016
  a32ee429 Browse Files
- Update problem-builder to version 2.0.3 · 2a5fce94
  Omar Khan committed Mar 16, 2016
  
  2a5fce94 Browse Files
15 Mar, 2016 9 commits
- Use is-hidden instead of hidden. · 091dc27c
  Diana Huang committed Mar 15, 2016
  
  091dc27c Browse Files
- Merge pull request #11664 from mitocw/feature/gs/visible_to_staff_only · b91f940a
```
Added visible_to_staff_only field to course blocks API
```
  Nimisha Asthagiri committed Mar 15, 2016
  b91f940a Browse Files
- Added visible_to_staff_only field to course blocks API · 6b8f3721
  George Schneeloch committed Mar 15, 2016
  
  6b8f3721 Browse Files
- Merge pull request #11814 from edx/clintonb/req-fix · aba4e588
```
Reverted rfc6266 change
```
  Toby Lawrence committed Mar 15, 2016
  aba4e588 Browse Files
- Reverted rfc6266 change · ae0a1289
```
The fork actually does include a commit that is not in the PyPI version.

ECOM-3833
```
  Clinton Blackburn committed Mar 15, 2016
  ae0a1289 Browse Files
- Merge pull request #11811 from edx/mrehan/tnl-4219-progress-detail-not-shown · 31cd7afc
```
render progress status while problem content rendering
```
  M. Rehan committed Mar 15, 2016
  31cd7afc Browse Files
- render progress status while problem content rendering · 167efea6
  Qubad786 committed Mar 15, 2016
  
  167efea6 Browse Files
- Merge pull request #11789 from edx/atiya/ECOM-3613-certificates-email-address · a3caac1f
```
Email address with '+' is accepted by Student Support.
```
  attiyaIshaque committed Mar 15, 2016
  a3caac1f Browse Files
- Merge pull request #11803 from open-craft/smarnach/update-dndv2-version · d29dcc16
```
Bump the version of the Drag&Drop XBlock to 2.0.4.
```
  Sven Marnach committed Mar 15, 2016
  d29dcc16 Browse Files
14 Mar, 2016 2 commits

Merge pull request #11613 from edx/ziafazal/WL-328 · a25caf31
```
Ziafazal/wl-328 multi-tenancy support in Comprehensive Theming
```
Matt Drayer committed Mar 14, 2016
a25caf31 Browse Files

ziafazal/WL-328: Multi-Site Comprehensive Theming · 954dae58

ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release

committed Mar 14, 2016

954dae58 Browse Files