Commits · 7b26e854785b7d072bee6d96df627f3ef773d17f · edx / edx-platform · GitLab

29 Aug, 2014 19 commits
- Merge branch 'release' into andya/merge-hotfix-2014-08-29 · 7b26e854
```
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
```
  Andy Armstrong committed Aug 29, 2014
  7b26e854 Browse Files
- Merge pull request #5006 from edx/will/ecom-199 · 5cc6455f
```
ECOM-199: Auto-registration bugfix
```
  Will Daly committed Aug 29, 2014
  5cc6455f Browse Files
- Merge pull request #5020 from edx/hotfix/reduce-studio-mongo-calls · 1838d9d4
```
Hotfix - reduce number of Studio mongo calls
```
  Andy Armstrong committed Aug 29, 2014
  1838d9d4 Browse Files
- Merge pull request #5025 from edx/ora2/release-2014-08-29T17.33 · e33d9b73
```
Updated ORA2 tag for release for August 29th, 2014
```
  Stephen Sanchez committed Aug 29, 2014
  e33d9b73 Browse Files
- Merge pull request #5024 from edx/sanchez/ECOM-216-django-template-settings · 1f4eb739
```
The main django template needs header and footer feature flags.
```
  Stephen Sanchez committed Aug 29, 2014
  1f4eb739 Browse Files
- Updated ORA2 tag for release for August 29th, 2014 · cd683cec
  Stephen Sanchez committed Aug 29, 2014
  
  cd683cec Browse Files
- Pre-cache has_changes when computing ancestors · c14891e9
  Andy Armstrong committed Aug 29, 2014
  
  c14891e9 Browse Files
- Add memoization for has_changes · 1db107c2
  Don Mitchell committed Aug 29, 2014
  
  1db107c2 Browse Files
- Add test to verify bad query behavior of xblock_handler · 3afc125e
  Calen Pennington committed Aug 29, 2014
  
  3afc125e Browse Files
- Improve debuggability when call-count numbers don't match up · 8dc7f342
  Calen Pennington committed Aug 29, 2014
  
  8dc7f342 Browse Files
- The main django template needs header and footer feature flags. · 20a66ee2
  Stephen Sanchez committed Aug 29, 2014
  
  20a66ee2 Browse Files
- Merge pull request #4943 from edx/mvo/bumping_bok_choy_version · 118baafb
```
bumping bok choy version
```
  clytwynec committed Aug 29, 2014
  118baafb Browse Files
- Exclude courses from the auto-registration A/B test · 9d4bf890
  Will Daly committed Aug 29, 2014
  
  9d4bf890 Browse Files
- Merge pull request #5010 from edx/waheed/refactor-verify-course-id-decorator · 539dd0c4
```
Refactor verify course id decorator and fixed tests.
```
  Waheed Ahmed committed Aug 29, 2014
  539dd0c4 Browse Files
- Refactor verify course id decorator and fixed tests. · 2e88e338
  Waheed Ahmed committed Aug 29, 2014
  
  2e88e338 Browse Files
- Merge pull request #4805 from edx/zub/bugfix/std2007-jumptoid · dbe1ba09
```
update get_parent_location method to select non-orphan parents from mult...
```
  zubair-arbi committed Aug 29, 2014
  dbe1ba09 Browse Files
- Merge pull request #4985 from edx/waheed/lms11132-fix-invalid-key-error-change-enrollment · cb826dd4
```
Fixed InvalidKeyError on change enrollment.
```
  Waheed Ahmed committed Aug 29, 2014
  cb826dd4 Browse Files
- update get_parent_location method to select non-orphan parents from multiple parents · 89e03d52
```
STUD-2007
```
  zubair-arbi committed Aug 29, 2014
  89e03d52 Browse Files
- Fixed InvalidKeyError on change enrollment. · 048984ba
```
LMS-11132
```
  Waheed Ahmed committed Aug 29, 2014
  048984ba Browse Files
28 Aug, 2014 21 commits
- Merge pull request #4937 from edx/dan-f/improve-course-group-coverage · 8a7fef07
```
Improve test coverage for course groups
```
  Daniel Friedman committed Aug 28, 2014
  8a7fef07 Browse Files
- Merge pull request #5012 from edx/jbau/fix-contained-in-order · 87068c41
```
change PaidCourseRegistration.contained_in_order
```
  Jason Bau committed Aug 28, 2014
  87068c41 Browse Files
- Merge pull request #4686 from Stanford-Online/stv/i18n/gettext · 64c94cf3
```
Monkey patch 'django.utils.translation'
```
  Sarina Canelake committed Aug 28, 2014
  64c94cf3 Browse Files
- Improve test coverage for course groups · a01e57ee
  Daniel Friedman committed Aug 28, 2014
  
  a01e57ee Browse Files
- bumping bok choy version · 688909eb
```
check firefox version, raise exception with instructions for updating
```
  Minh Tue Vo committed Aug 28, 2014
  688909eb Browse Files
- Merge pull request #4950 from edx/sarina/fix-18n · d9c7a42e
```
Remove i18n from ux reference templates
```
  Sarina Canelake committed Aug 28, 2014
  d9c7a42e Browse Files
- Studio: adding in usage note to UX reference templates · 335298c8
  Brian Talbot committed Aug 28, 2014
  
  335298c8 Browse Files
- Remove i18n from ux reference templates · d233570c
  Sarina Canelake committed Aug 28, 2014
  
  d233570c Browse Files
- Merge pull request #5013 from edx/will/ecom-113 · fe3472cb
```
ECOM-113: Already verified page sometimes displays the incorrect price
```
  Will Daly committed Aug 28, 2014
  fe3472cb Browse Files
- change PaidCourseRegistration.contained_in_order · 63cfcd3d
```
now handles cases where the order has both a PaidCourseRegistration
and a CertificateItem
```
  Jason Bau committed Aug 28, 2014
  63cfcd3d Browse Files
- Use new-style course locators consistently when setting the donation amount in the session · 83bfb178
```
Update devstack settings to use new CyberSource API
```
  Will Daly committed Aug 28, 2014
  83bfb178 Browse Files
- Merge pull request #4984 from edx/cdodge/fix-white-label-footers · 17395248
```
be sure to just use the Open edX footer.html when we're running a white ...
```
  chrisndodge committed Aug 28, 2014
  17395248 Browse Files
- Bugfix for ECOM-199: Visitors removed from auto-enroll pool if they need to… · 3af9943d
```
Bugfix for ECOM-199: Visitors removed from auto-enroll pool if they need to authenticate while attempting to enroll
Sets a session variable as soon as a user enters the experimental condition to ensure that they stay in that condition,
even if they later access the control URL (e.g. from a redirect on the login page)
```
  Will Daly committed Aug 28, 2014
  3af9943d Browse Files
- Merge pull request #5008 from edx/will/style-fixups-in-student-tests · 9a554ec3
```
Pep8 and Pylint fixes to the student tests
```
  Will Daly committed Aug 28, 2014
  9a554ec3 Browse Files
- Merge pull request #4612 from edx/dcs/matlab-api-tweak · 7d6c466c
```
A better check for the existence of matlabinput element.
```
  Dave St.Germain committed Aug 28, 2014
  7d6c466c Browse Files
- Merge pull request #4979 from edx/sanchez/update-login-button-styles · 739ee04f
```
Updating LMS Login button to line up SASS with Drupal Login button
```
  Stephen Sanchez committed Aug 28, 2014
  739ee04f Browse Files
- Merge pull request #4939 from edx/ammar/bok-choy-transcript-tests-batch3 · 2efee4eb
```
Bok-Choy Video Transcript Tests Batch3
```
  muhammad-ammar committed Aug 28, 2014
  2efee4eb Browse Files
- Merge pull request #5004 from edx/waheed/lms11249-fix-typo-on-id-verfication · 50535ac8
```
Fixed typo on student id verification.
```
  Waheed Ahmed committed Aug 28, 2014
  50535ac8 Browse Files
- Merge pull request #4780 from cpennington/split-bulk-operations · d39da7fd
```
Implement bulk operations on the split modulestore.
```
  Calen Pennington committed Aug 28, 2014
  d39da7fd Browse Files
- Fixed typo on student id verification. · bedb8830
```
LMS-11249
```
  Waheed Ahmed committed Aug 28, 2014
  bedb8830 Browse Files
- Merge pull request #5009 from edx/ahodges/doc/reldatechg · ae240ae7
```
Release date change & fixed two broken links
```
  Alison Hodges committed Aug 28, 2014
  ae240ae7 Browse Files