Commits · 78acd083be255f74a857274ae1eef353a969e157 · edx / edx-platform

04 Sep, 2013 1 commit

Merge branch 'master' into ormsbee/verifyuser3 · 78acd083

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss

committed Sep 04, 2013

78acd083 Browse Files

03 Sep, 2013 24 commits
- Fix up some links to point to the right place. · 35a7b75e
  Diana Huang committed Sep 03, 2013
  
  35a7b75e Browse Files
- Verification: moves common page elements/copy into central templates w/ supportive styling · b75398b0
  Brian Talbot committed Sep 03, 2013
  
  b75398b0 Browse Files
- Mark tests for unimplemented features as skip so that the acceptance tests will… · a432cffc
```
Mark tests for unimplemented features as skip so that the acceptance tests will all pass when we merge into master.
```
  Jay Zoldak committed Sep 03, 2013
  a432cffc Browse Files
- Verification: syncing all submit button-type styling (including newly used… · 70ba52b4
```
Verification: syncing all submit button-type styling (including newly used element on verified view)
```
  Brian Talbot committed Sep 03, 2013
  70ba52b4 Browse Files
- Verification: resolves layout issue with progress nav in diff screen widths · dc850370
  Brian Talbot committed Sep 03, 2013
  
  dc850370 Browse Files
- Verification: adds styling for already verified view and refactors html/styling for shared elements · 4b3918c7
  Brian Talbot committed Sep 03, 2013
  
  4b3918c7 Browse Files
- Add the javascript to control payment button back in. · 0c3af967
  Diana Huang committed Sep 03, 2013
  
  0c3af967 Browse Files
- Merge branch 'zoldak/certificates-acceptance-tests' into ormsbee/verifyuser3 · 6c36e9ca
  Jay Zoldak committed Sep 03, 2013
  
  6c36e9ca Browse Files
- Change css for payment page for better synchronization. · e0110bf1
  Jay Zoldak committed Sep 03, 2013
  
  e0110bf1 Browse Files
- Verification: added in supporting disabled/not ready styling for wizard nav + expandable height fix · 47a9f8fc
  Brian Talbot committed Sep 03, 2013
  
  47a9f8fc Browse Files
- Fix Javascript bugs that arose during refactoring. · d1ec21ed
  Diana Huang committed Sep 03, 2013
  
  d1ec21ed Browse Files
- Fix Javascript bugs that arose during refactoring. · 98f80c36
  Diana Huang committed Sep 03, 2013
  
  98f80c36 Browse Files
- Automate more scenarios · b9ccc37c
  Jay Zoldak committed Sep 03, 2013
  
  b9ccc37c Browse Files
- Change CSS after rebase. · 7bc997d0
  Jay Zoldak committed Sep 03, 2013
  
  7bc997d0 Browse Files
- Implemented fake payment page. · e0372b00
  Will Daly committed Sep 03, 2013
  
  e0372b00 Browse Files
- Initial BDD spec for certificates workflow · a52ca363
  Will Daly committed Sep 03, 2013
  
  a52ca363 Browse Files
- Verification: addresses regression of missing 'registering as:' copy · 8f6c07fd
  Brian Talbot committed Sep 02, 2013
  
  8f6c07fd Browse Files
- Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3 · 9c6aa178
  David Ormsbee committed Sep 02, 2013
  
  9c6aa178 Browse Files
- add warning message to make sure image capture canvas attributes aren't removed · 840da44e
  David Ormsbee committed Sep 02, 2013
  
  840da44e Browse Files
- Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3 · aecaff20
```
Conflicts:
	lms/templates/verify_student/photo_verification.html
```
  David Ormsbee committed Sep 02, 2013
  aecaff20 Browse Files
- Verification: add in I8TN support for new templates · 4af4b2a0
  Brian Talbot committed Sep 02, 2013
  
  4af4b2a0 Browse Files
- Image capture support for non WebRTC compliant browsers, via Flash. · a643e255
  David Ormsbee committed Sep 02, 2013
  
  a643e255 Browse Files
- Verification: removes physical sizes from HTML templates and adds placeholder hooks · c77deeec
  Brian Talbot committed Sep 02, 2013
  
  c77deeec Browse Files
- Verification: adds in progress styling support based on body classes · 39d75342
  Brian Talbot committed Sep 02, 2013
  
  39d75342 Browse Files
30 Aug, 2013 15 commits
- Merge pull request #790 from edx/unanswered-on-input · 6defd7ba
```
Unanswered on input
```
  Sarina Canelake committed Aug 30, 2013
  6defd7ba Browse Files
- Acceptance tests for visual correctness reset feature · fe47dcb1
  Peter Baratta committed Aug 30, 2013
  
  fe47dcb1 Browse Files
- Merge pull request #841 from edx/jbau/bulk-email-faster-tests · b7e8af65
```
Jbau/bulk email faster tests
```
  Jason Bau committed Aug 30, 2013
  b7e8af65 Browse Files
- Merge pull request #843 from edx/adam/calc-refactor · 8d7d8194
```
Adam/calc refactor
```
  Adam committed Aug 30, 2013
  8d7d8194 Browse Files
- bump version number on calc · 5b0194d9
  Adam Palay committed Aug 30, 2013
  
  5b0194d9 Browse Files
- change calcfunctions -> functions · 589dcfcc
  Adam Palay committed Aug 30, 2013
  
  589dcfcc Browse Files
- specify preview import statements to reflect new package structure · 2284f56e
  Adam Palay committed Aug 30, 2013
  
  2284f56e Browse Files
- restructure calc · ac906795
  Adam Palay committed Aug 30, 2013
  
  ac906795 Browse Files
- remove vestigal references to fake_smtp_server · 4f9e5109
  Jason Bau committed Aug 30, 2013
  
  4f9e5109 Browse Files
- using mocks to make test_err_handling.py faster · ca33a1dc
  Jason Bau committed Aug 30, 2013
  
  ca33a1dc Browse Files
- Verified: resolves requirements page layout regression · 1f60d018
  Brian Talbot committed Aug 30, 2013
  
  1f60d018 Browse Files
- Merge pull request #811 from cpennington/initialize-mitxmako-at-startup · ea36b834
```
Move mitxmako initialization to a startup module
```
  Calen Pennington committed Aug 30, 2013
  ea36b834 Browse Files
- Verified: revises styling/presentation of alerts/errors for intro state · 822caca3
  Brian Talbot committed Aug 30, 2013
  
  822caca3 Browse Files
- Merge pull request #794 from cpennington/upgrade-newrelic · b0cdbbc1
```
Upgrade newrelic agent to the latest version
```
  Calen Pennington committed Aug 30, 2013
  b0cdbbc1 Browse Files
- Allow for the creation of a specialized receipt when · c9593f20
```
there is only one item in the order
```
  Diana Huang committed Aug 30, 2013
  c9593f20 Browse Files