Commits · 7bf8221b89ce1cfc997a6fa5cc145cc6a38d2c93 · edx / edx-platform

18 Dec, 2014 1 commit
- updated commit hash for VAL · 7bf8221b
  christopher lee committed Dec 18, 2014
  
  7bf8221b Browse Files
17 Dec, 2014 3 commits
- Merge pull request #6291 from edx/hotfix/2014-12-17 · 66ab1655
```
Hotfix/2014 12 17
```
  Fred Smith committed Dec 17, 2014
  66ab1655 Browse Files
- update ora version · 4d2df01d
  Adam Palay committed Dec 17, 2014
  
  4d2df01d Browse Files
- Added test for OpenAssessmentBlock mixin. · 208ee26c
```
TNL-1022
```
  Waheed Ahmed committed Dec 17, 2014
  208ee26c Browse Files
15 Dec, 2014 11 commits
- Merge pull request #6265 from edx/sarina/2014-12-15-translations-updates · c4bbf49b
```
Update translations (autogenerated message)
```
  Fred Smith committed Dec 15, 2014
  c4bbf49b Browse Files
- Update translations (autogenerated message) · f70e531d
  Sarina Canelake committed Dec 15, 2014
  
  f70e531d Browse Files
- Merge pull request #6262 from edx/cdodge/also-sort-in-courses-list · c46c247e
```
also apply sorting rules overrides to the /courses view
```
  chrisndodge committed Dec 15, 2014
  c46c247e Browse Files
- Merge pull request #6257 from edx/mobile/video-pipeline-squashed · ee103659
```
Add video upload feature to Studio
```
  Greg Price committed Dec 15, 2014
  ee103659 Browse Files
- also apply sorting rules overrides to the /courses view · 483cccb6
  Chris Dodge committed Dec 15, 2014
  
  483cccb6 Browse Files
- Studio video upload feature template and styling · 578c96a8
```
Co-authored-by: Greg Price <gprice@edx.org>
```
  Chris committed Dec 15, 2014
  578c96a8 Browse Files
- Add front end for Studio video upload feature · 61cb5159
```
Co-authored-by: Chris <crodriguez@edx.org>
Co-authored-by: Mark Hoeber <hoeber@edx.org>
```
  Greg Price committed Dec 15, 2014
  61cb5159 Browse Files
- Add back end for Studio video upload feature · 0687a62a
```
This feature allows upload of video assets to S3. This requires that the
VIDEO_UPLOAD_PIPELINE setting be properly configured and that each
course be configured with a token issued by the media team for their
processing purposes (e.g. linking the video with a YouTube channel).

Co-authored-by: Greg Price <gprice@edx.org>
```
  Nimisha Asthagiri committed Dec 15, 2014
  0687a62a Browse Files
- fix preview link generation for course reruns (PLAT-336) · 5c1834b6
  Adam Palay committed Dec 15, 2014
  
  5c1834b6 Browse Files
- Merge pull request #6210 from edx/zub/bugfix/tnl-922-key-error-getting-position · baaf5fa8
```
set position to default value if POST request don't have position argume...
```
  zubair-arbi committed Dec 15, 2014
  baaf5fa8 Browse Files
- set position to default value if POST request don't have position argument · 1d6d2f2a
```
TNL-922
```
  zubair-arbi committed Dec 15, 2014
  1d6d2f2a Browse Files
14 Dec, 2014 2 commits

Merge pull request #6242 from edx/cdodge/move-shoppingcart-button-detection · 8a685cec
```
change the context_processor in the shopping cart to return a pointer to...
```
chrisndodge committed Dec 14, 2014
8a685cec Browse Files

change the context_processor in the shopping cart to return a pointer to a… · 11483669

change the context_processor in the shopping cart to return a pointer to a function so that only the templates that actually need to know if the shopping cart button should be shown will actually make the database roundtrips

committed Dec 14, 2014

11483669 Browse Files

13 Dec, 2014 7 commits
- Merge pull request #6162 from cpennington/xblock-asides · d0b3fcc0
```
XBlockAsides in LMS
```
  Calen Pennington committed Dec 13, 2014
  d0b3fcc0 Browse Files
- Make ErrorDescriptor more resistent to errors · 822eaa20
  Calen Pennington committed Dec 13, 2014
  
  822eaa20 Browse Files
- Teach LMS how to render XBlockAsides · d919d2ae
```
[PLAT-217]
```
  Calen Pennington committed Dec 13, 2014
  d919d2ae Browse Files
- Add a configuration model for managing XBlockAsides · e20fe2b8
  Calen Pennington committed Dec 12, 2014
  
  e20fe2b8 Browse Files
- Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database… · 980f30c1
```
Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it
```
  Calen Pennington committed Dec 12, 2014
  980f30c1 Browse Files
- Extract common base functionality for storing xblock fields in the relation db · 42792e97
  Calen Pennington committed Dec 12, 2014
  
  42792e97 Browse Files
- Make a generic django field for storing OpaqueKey classes · ccbff2da
  Calen Pennington committed Dec 12, 2014
  
  ccbff2da Browse Files
12 Dec, 2014 16 commits
- Merge pull request #6238 from edx/clytwynec/fix_failing_git_export_tests · 0bce5569
```
fix git_export tests
```
  Christine Lytwynec committed Dec 12, 2014
  0bce5569 Browse Files
- Merge pull request #6239 from edx/clytwynec/fix_pep8_violation · a63013c2
```
fix pep8 violation
```
  Christine Lytwynec committed Dec 12, 2014
  a63013c2 Browse Files
- fix pep8 violation · 197f50b9
  Christine Lytwynec committed Dec 12, 2014
  
  197f50b9 Browse Files
- Merge pull request #6235 from edx/dan-f/fix-test-typo · 5be9488f
```
Fix typo in cms unit test
```
  Daniel Friedman committed Dec 12, 2014
  5be9488f Browse Files
- Merge pull request #6232 from edx/clytwynec/fix_failing_cohort_test · b24a237c
```
fixes failing unit test in course_groups
```
  Christine Lytwynec committed Dec 12, 2014
  b24a237c Browse Files
- fix git_export tests · b9668acb
  Christine Lytwynec committed Dec 12, 2014
  
  b9668acb Browse Files
- Merge pull request #6153 from edx/db/update-pep8 · 3bcf18dd
```
Update pep8 to 1.5.7
```
  David Baumgold committed Dec 12, 2014
  3bcf18dd Browse Files
- Re-add and clarify comment · 48c349ff
  David Baumgold committed Dec 12, 2014
  
  48c349ff Browse Files
- Fix typo in cms unit test · 7e2e90e4
  Daniel Friedman committed Dec 12, 2014
  
  7e2e90e4 Browse Files
- fixes failing unit test in course_groups · 3c1821a7
  Christine Lytwynec committed Dec 12, 2014
  
  3c1821a7 Browse Files
- Merge pull request #6230 from edx/sarina/fix-openedx-logo · 035a4804
```
Change openedx footer image to a non-broken link
```
  Sarina Canelake committed Dec 12, 2014
  035a4804 Browse Files
- Merge pull request #5449 from Stanford-Online/njdup/bulk_emails_keyword_sub · 2e5b9676
```
Implements keyword sub feature for bulk emails
```
  Sarina Canelake committed Dec 12, 2014
  2e5b9676 Browse Files
- Change openedx footer image to a non-broken link · d2b11991
  Sarina Canelake committed Dec 12, 2014
  
  d2b11991 Browse Files
- For methods on PasswordHistory, only calculate if necessary · 08a8afa6
```
Check settings.FEATURES["ADVANCED_SECURITY"] first
```
  David Baumgold committed Dec 12, 2014
  08a8afa6 Browse Files
- Merge pull request #6225 from edx/studio-i18n-improvements · e53263d9
```
Don't break up i18n string
```
  David Baumgold committed Dec 12, 2014
  e53263d9 Browse Files
- Replace — with literal emdash · e8d62ff6
  David Baumgold committed Dec 12, 2014
  
  e8d62ff6 Browse Files