Commits · 18f69809227d1c06271f33ad770dd730e97dff10 · edx / edx-platform

15 Dec, 2014 8 commits
- Merge pull request #6247 from edx/will/update-verified-requirements · 18f69809
```
Separate verification / payment flow.
```
  Will Daly committed Dec 15, 2014
  18f69809 Browse Files
- Separate verification / payment flow. · 93cc03a5
  Will Daly committed Dec 15, 2014
  
  93cc03a5 Browse Files
- Merge pull request #6245 from edx/will/email-opt-in-updates · 49cb0486
```
Add header row to email opt in list; add default date
```
  Will Daly committed Dec 15, 2014
  49cb0486 Browse Files
- Merge pull request #6233 from edx/adam/fix-preview-courseruns · ce89823f
```
fix preview link generation for course reruns (PLAT-336)
```
  Adam committed Dec 15, 2014
  ce89823f Browse Files
- fix preview link generation for course reruns (PLAT-336) · 59343ed6
  Adam Palay committed Dec 15, 2014
  
  59343ed6 Browse Files
- Add header row to email opt in list; add default date · 5df1ffeb
  Will Daly committed Dec 15, 2014
  
  5df1ffeb 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 23 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
- Merge pull request #6111 from edx/zoldak/modulestore-test-config · b999714e
```
Unit test speed improvements
```
  Jesse Zoldak committed Dec 12, 2014
  b999714e Browse Files
- Move simplefilter comments before call · 4fcf1f9e
  David Baumgold committed Dec 12, 2014
  
  4fcf1f9e Browse Files
- Add comments about disabled pep8 rules · 838ce74a
  David Baumgold committed Dec 12, 2014
  
  838ce74a Browse Files
- Double quotes for i18n string · 1fe72d89
  David Baumgold committed Dec 12, 2014
  
  1fe72d89 Browse Files
- Don't break up i18n string · 71a74c41
  David Baumgold committed Dec 12, 2014
  
  71a74c41 Browse Files
- Merge pull request #6211 from Shrhawk/shr/bug/TNL-964-navbar-display-display-issue · cc377e8c
```
Fix white spaces inside navigation
```
  Shrhawk committed Dec 12, 2014
  cc377e8c Browse Files
- Merge pull request #6198 from edx/afzaledx/WL-105 · b533e337
```
WL-105 Show course cards sorted by start dates, oldest first.
```
  chrisndodge committed Dec 11, 2014
  b533e337 Browse Files