Commits · eb465b30343bd51a6e13b9909a7a65b4d13befac · edx / edx-platform · GitLab

16 Dec, 2014 12 commits
- Update to the latest lettuce and install from pypi · eb465b30
  Jesse Zoldak committed Dec 16, 2014
  
  eb465b30 Browse Files
- Merge pull request #6273 from edx/renzo/fix-shoppingcart-tests · 7699b5ff
```
Fix unit test failure due to stale urls.py
```
  Renzo Lucioni committed Dec 16, 2014
  7699b5ff Browse Files
- Fix unit test failure due to stale urls.py · cdcd5d79
  Renzo Lucioni committed Dec 16, 2014
  
  cdcd5d79 Browse Files
- Merge pull request #6268 from edx/will/simplify-template-loading · b4a8302e
```
Inline underscore templates; add pre render step
```
  Will Daly committed Dec 16, 2014
  b4a8302e Browse Files
- Merge pull request #6267 from edx/renzo/remove-webcam-approve-button · 9faddd9b
```
Remove webcam capture approval button (checkmark)
```
  Renzo Lucioni committed Dec 16, 2014
  9faddd9b Browse Files
- Merge pull request #6201 from edx/renzo/postpayment-email · 95025dfc
```
Add a verification reminder to order confirmation emails
```
  Renzo Lucioni committed Dec 16, 2014
  95025dfc Browse Files
- Add a verification reminder to order confirmation emails · dfcbcd54
  Renzo Lucioni committed Dec 16, 2014
  
  dfcbcd54 Browse Files
- Remove webcam capture approval button (checkmark) · 94b22bcd
  Renzo Lucioni committed Dec 16, 2014
  
  94b22bcd Browse Files
- Merge pull request #6246 from edx/zub/bugfix/plat-332-location-revison-error · 5371d173
```
fix location revision error for multi parent draft
```
  zubair-arbi committed Dec 16, 2014
  5371d173 Browse Files
- Merge pull request #5685 from edx/uncomment-thumbnail-tests · 6b824897
```
Uncomment thumbnail tests
```
  David Baumgold committed Dec 16, 2014
  6b824897 Browse Files
- Inline underscore templates; add pre render step · 80f5d421
  Will Daly committed Dec 16, 2014
  
  80f5d421 Browse Files
- Merge pull request #6142 from edx/muhhshoaib/WL-106-MIT-Course-Information-Page-side-bar · cb1058ac
```
MIT: Course Information Page side bar
```
  chrisndodge committed Dec 15, 2014
  cb1058ac Browse Files
15 Dec, 2014 17 commits
- Merge pull request #6264 from edx/alasdair/dashboard-prof-ed-banner · 70c2adb9
```
ECOM-728 updated dashboard course banners so all types of course are now...
```
  AlasdairSwan committed Dec 15, 2014
  70c2adb9 Browse Files
- ECOM-728 updated dashboard course banners so all types of course are now… · 9b59e387
```
ECOM-728 updated dashboard course banners so all types of course are now supported as per the new design. Included some other small tweaks to other text on the page in consultation with AndyWaldrop
```
  AlasdairSwan committed Dec 15, 2014
  9b59e387 Browse Files
- Merge pull request #6260 from edx/will/combine-intro-and-make-payment · 788cc350
```
Combine payment and intro step
```
  Will Daly committed Dec 15, 2014
  788cc350 Browse Files
- Merge pull request #6263 from edx/renzo/full-name-placeholder · c6b1ca34
```
Use current full name as placeholder text
```
  Renzo Lucioni committed Dec 15, 2014
  c6b1ca34 Browse Files
- Use current full name as placeholder text · 9874a8d3
  Renzo Lucioni committed Dec 15, 2014
  
  9874a8d3 Browse Files
- Merge pull request #6240 from edx/benp/fix-analytics-init · a0629003
```
Mock out the underlying segment-io call.
```
  Ben Patterson committed Dec 15, 2014
  a0629003 Browse Files
- Combine payment and intro step · d3c3f734
  Will Daly committed Dec 15, 2014
  
  d3c3f734 Browse Files
- 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
- added the course price in the course about page · 914ecac9
  Muhammad Shoaib committed Dec 15, 2014
  
  914ecac9 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
- fix location revision error for multi parent draft · 99b86d7b
```
PLAT-332
```
  zubair-arbi committed Dec 15, 2014
  99b86d7b 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 4 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
```
  Chris Dodge committed Dec 14, 2014
  11483669 Browse Files
- Pipe analytics client output to stdout instead of devnull. · e0f83ded
  Ben Patterson committed Dec 13, 2014
  
  e0f83ded Browse Files
- Fix another analytics.init secret error message (noise). · 352fce6e
  Ben Patterson committed Dec 13, 2014
  
  352fce6e 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
- Mock out the underlying segment-io call. · 7be7b50b
```
TE-532
```
  Ben Patterson committed Dec 12, 2014
  7be7b50b 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