Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
17,405 Commits 1 Branch 0 Tags
b2ddea7a80bbb073c15e8b8bfbb9d446af20d8ed
Commit Graph

17405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frances Botsford
b2ddea7a80 updated copy for vcert flow 2013-09-04 13:46:38 -04:00
Diana Huang
2e3a918da2 Clean up and fix some bugs on the 'already verified' page. 2013-09-04 11:31:03 -04:00
Diana Huang
18a497e150 Fix merge conflict in sass 2013-09-04 11:22:52 -04:00
Diana Huang
03a4af7add Fix failing tests. 2013-09-04 11:21:31 -04:00
David Ormsbee
e7c07d4e43 Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3 2013-09-04 10:59:18 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
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
 2013-09-04 10:58:30 -04:00
Jay Zoldak
41e3ffc216 Enable developer local overrides to acceptance settings 2013-09-04 09:36:54 -04:00
Diana Huang
f4c1a8f27b Update the carousel with which step the user is on 2013-09-04 09:21:07 -04:00
Diana Huang
35a7b75eb2 Fix up some links to point to the right place. 2013-09-03 18:03:02 -04:00
Brian Talbot
b75398b0df Verification: moves common page elements/copy into central templates w/ supportive styling 2013-09-03 17:17:13 -04:00
Jay Zoldak
a432cffc2c Mark tests for unimplemented features as skip so that the acceptance tests will all pass when we merge into master. 2013-09-03 16:42:03 -04:00
Brian Talbot
70ba52b4fa Verification: syncing all submit button-type styling (including newly used element on verified view) 2013-09-03 16:37:34 -04:00
Brian Talbot
dc850370b2 Verification: resolves layout issue with progress nav in diff screen widths 2013-09-03 16:33:25 -04:00
Brian Talbot
4b3918c7e5 Verification: adds styling for already verified view and refactors html/styling for shared elements 2013-09-03 16:30:42 -04:00
Diana Huang
0c3af96792 Add the javascript to control payment button back in. 2013-09-03 14:35:38 -04:00
Jay Zoldak
6c36e9caad Merge branch 'zoldak/certificates-acceptance-tests' into ormsbee/verifyuser3 2013-09-03 13:53:35 -04:00
Jay Zoldak
e0110bf108 Change css for payment page for better synchronization. 2013-09-03 13:51:47 -04:00
Brian Talbot
47a9f8fc5f Verification: added in supporting disabled/not ready styling for wizard nav + expandable height fix 2013-09-03 12:55:17 -04:00
Diana Huang
d1ec21ed1c Fix Javascript bugs that arose during refactoring. 2013-09-03 12:53:34 -04:00
Diana Huang
98f80c36c1 Fix Javascript bugs that arose during refactoring. 2013-09-03 10:57:49 -04:00
Jay Zoldak
b9ccc37c57 Automate more scenarios 2013-09-03 10:46:33 -04:00
Jay Zoldak
7bc997d0fb Change CSS after rebase. 2013-09-03 10:46:33 -04:00
Will Daly
e0372b00ef Implemented fake payment page. 2013-09-03 10:46:33 -04:00
Will Daly
a52ca3639b Initial BDD spec for certificates workflow 2013-09-03 10:46:32 -04:00
Brian Talbot
8f6c07fd93 Verification: addresses regression of missing 'registering as:' copy 2013-09-02 22:47:50 -04:00
David Ormsbee
9c6aa178bc Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3 2013-09-02 22:41:41 -04:00
David Ormsbee
840da44e46 add warning message to make sure image capture canvas attributes aren't removed 2013-09-02 22:41:06 -04:00
David Ormsbee
aecaff2097 Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3 
Conflicts:
	lms/templates/verify_student/photo_verification.html
 2013-09-02 22:39:52 -04:00
Brian Talbot
4af4b2a022 Verification: add in I8TN support for new templates 2013-09-02 22:38:08 -04:00
David Ormsbee
a643e25591 Image capture support for non WebRTC compliant browsers, via Flash. 2013-09-02 22:16:51 -04:00
Brian Talbot
c77deeecff Verification: removes physical sizes from HTML templates and adds placeholder hooks 2013-09-02 21:42:51 -04:00
Brian Talbot
39d7534246 Verification: adds in progress styling support based on body classes 2013-09-02 21:20:02 -04:00
Sarina Canelake
6defd7baf1 Merge pull request #790 from edx/unanswered-on-input 
Unanswered on input
 2013-08-30 14:25:21 -07:00
Peter Baratta
fe47dcb122 Acceptance tests for visual correctness reset feature 2013-08-30 17:24:33 -04:00
Jason Bau
b7e8af65be Merge pull request #841 from edx/jbau/bulk-email-faster-tests 
Jbau/bulk email faster tests
 2013-08-30 14:12:12 -07:00
Adam
8d7d819414 Merge pull request #843 from edx/adam/calc-refactor 
Adam/calc refactor
 2013-08-30 14:04:22 -07:00
Adam Palay
5b0194d9b4 bump version number on calc 2013-08-30 16:59:46 -04:00
Adam Palay
589dcfcc35 change calcfunctions -> functions 2013-08-30 16:57:44 -04:00
Adam Palay
2284f56e20 specify preview import statements to reflect new package structure 2013-08-30 16:57:27 -04:00
Adam Palay
ac90679544 restructure calc 2013-08-30 16:57:10 -04:00
Jason Bau
4f9e5109f0 remove vestigal references to fake_smtp_server 2013-08-30 13:46:04 -07:00
Jason Bau
ca33a1dcf5 using mocks to make test_err_handling.py faster 2013-08-30 13:43:42 -07:00
Brian Talbot
1f60d018a6 Verified: resolves requirements page layout regression 2013-08-30 16:16:27 -04:00
Calen Pennington
ea36b834c7 Merge pull request #811 from cpennington/initialize-mitxmako-at-startup 
Move mitxmako initialization to a startup module
 2013-08-30 13:10:09 -07:00
Brian Talbot
822caca3f7 Verified: revises styling/presentation of alerts/errors for intro state 2013-08-30 16:03:49 -04:00
Calen Pennington
b0cdbbc1fe Merge pull request #794 from cpennington/upgrade-newrelic 
Upgrade newrelic agent to the latest version
 2013-08-30 12:56:11 -07:00
Diana Huang
c9593f2094 Allow for the creation of a specialized receipt when 
there is only one item in the order
 2013-08-30 15:35:05 -04:00
Brian Talbot
248b5a9411 Verified: visually cleans up - UI spacing, error styling, registering for badge 2013-08-30 14:27:44 -04:00
Brian Talbot
e9a0755e5d revises and transfers verification-only typography Sass extends 2013-08-30 14:27:44 -04:00
Diana Huang
cd479caa78 Make sure users are logged in on the verified cert path 2013-08-30 13:58:36 -04:00