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

17425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
4e011326bc Replace placeholder 'Course Name' in paid cert templates with the actual course name 2013-09-05 23:39:35 -04:00
Diana Huang
20d72ea703 Clean up views and start work on edit name modal. 2013-09-05 15:20:48 -04:00
Brian Talbot
f4bdd73839 Verification: adds in verified/enrollment status into dashboard course listings 2013-09-05 14:29:11 -04:00
Brian Talbot
f686990b02 LMS: adds in additional abstract border-variables with logical scale 2013-09-05 14:29:10 -04:00
Brian Talbot
f2e55a3d6a Verification: abstracting out specific color-based Sass variables to be *somewhat* friendly to theming 2013-09-05 14:29:10 -04:00
Frances Botsford
48fed2052f adding in conditional IE hooks in lms main template 2013-09-05 14:18:27 -04:00
David Ormsbee
22480b821a Fix reset button for photo capture 2013-09-05 14:15:13 -04:00
Frances Botsford
a8989f2fe6 adjusting go to course button for vcert receipt 2013-09-05 12:40:37 -04:00
Frances Botsford
304a329b08 initial receipt html and styling for vcert 2013-09-05 12:24:03 -04:00
Brian Talbot
9c96fcf4cd edx.org: ensures that the iframe-based register button has a transparent background 2013-09-05 10:00:34 -04:00
Diana Huang
4ab204cce7 Only create a new photo verification if one doesn't already exist. 2013-09-05 08:50:59 -04:00
Brian Talbot
70cdc9a705 edx.org: addresses vertical scrollbar on course register button when placed in iframe 2013-09-05 08:49:02 -04:00
Brian Talbot
5c8e7337a8 edx.org: revises course register button background for all cases (verified, riught column, and bottom of page) 2013-09-04 16:06:44 -04:00
Brian Talbot
d4e849d2b2 edx.org: adds custom styling for register button in case of verified option/content displayed 2013-09-04 15:30:10 -04:00
Diana Huang
a1373f4830 Update content of the order confirmation e-mail. 2013-09-04 15:17:08 -04:00
Diana Huang
f819137b30 Fix bracket bug. 2013-09-04 15:17:08 -04:00
Frances Botsford
ccc3589ecb removing test code from dev.py 2013-09-04 14:53:36 -04:00
Frances Botsford
1afdc70b2d text code cleanup on photo page 2013-09-04 14:44:13 -04:00
Brian Talbot
732ac1783f edx.org: adds background to register button's html body element for visual blending in course detail view 2013-09-04 14:40:53 -04:00
Frances Botsford
db57118f7d i18n and updated secondary action buttons on the photo page 2013-09-04 14:35:48 -04:00
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