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

2634 Commits

Author SHA1 Message Date
Brian Talbot
59a7a47b02 Verification: changes formatting of billing address/info on receipt view 2013-09-10 16:51:21 -04:00
Brian Talbot
253f8e2d15 Verification: revises UI header copy 2013-09-10 16:51:21 -04:00
David Ormsbee
ba1f17e54b Merge pull request #913 from edx/ormsbee/certs_small_ux 
Small UI fixes
 2013-09-10 10:34:32 -07:00
David Ormsbee
740e5bace7 Prevent being able to click on disabled button in IE. 
Enable display of course org, num in receipt page.
 2013-09-10 13:32:52 -04:00
Frances Botsford
18b4b0b03f modal functionality for edit name on vcerts 2013-09-10 13:03:09 -04:00
Frances Botsford
5c7443be38 cleanup copy on reqs, photo, and choose pages 2013-09-10 09:13:00 -04:00
Valera Rozuvan
ee02c06250 Add Learning Tools Interoperability (LTI) blade. 
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
 2013-09-10 12:30:42 +03:00
Diana Huang
24efb4e8d6 Clean up text of Order Confirmation E-mail. 2013-09-09 15:56:01 -04:00
Diana Huang
d3454e58b5 Undo some of the hacks to make receipt rendering work. 2013-09-09 14:02:28 -04:00
David Ormsbee
9f40263f7b Fix broken callout to template partial from receipt page. 2013-09-09 11:00:01 -04:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	lms/envs/common.py
 2013-09-09 10:18:25 -04:00
Brian Talbot
79a9c8677a Verification: revises presentation of customized certificate receipt ciew 2013-09-06 17:23:43 -04:00
Vik Paruchuri
499d272adc Merge pull request #825 from edx/fix/vik/staff-information 
Staff information about duplicate ORA submissions
 2013-09-06 14:14:31 -07:00
Diana Huang
ec67bf4bec Only show start date on receipt if it's in the future. 2013-09-06 13:48:40 -04:00
Brian Talbot
6084412544 Verification: changed page title, progress to reflect registration completion + I8TN copy changes 2013-09-06 12:12:58 -04:00
Brian Talbot
6a081ffc38 Verification: adds current step text into receipt view's progress nav 2013-09-06 12:12:58 -04:00
Frances Botsford
47df7e420f ux adjustments to vcert flow 2013-09-06 12:02:37 -04:00
Vik Paruchuri
0fbbaa83d6 Fix some staff-facing messages 2013-09-06 11:17:46 -04:00
Frances Botsford
af2424daf1 adjustments to choose and contribution for vcerts 2013-09-06 10:23:46 -04:00
David Ormsbee
90923f3e12 Add min_price var to _contribution.html template 2013-09-06 10:11:29 -04:00
Diana Huang
698872a810 Clean up names and links for receipts/emails. 2013-09-06 10:01:09 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Frances Botsford
4175db0a67 adding basic meta tags - for ie edge and mobile - to main template header 2013-09-06 09:13:03 -04:00
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
Frances Botsford
48fed2052f adding in conditional IE hooks in lms main template 2013-09-05 14:18:27 -04:00
Frances Botsford
a8989f2fe6 adjusting go to course button for vcert receipt 2013-09-05 12:40:37 -04:00
Vik Paruchuri
a6068201e1 Add in a staff warning message about duplicates 2013-09-05 12:29:21 -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
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
Jason Bau
08168ec67f Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel 
Add link in lms legacy instructor dashboard to cms course_index
 2013-09-04 13:03:21 -07: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
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms 
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
 2013-09-04 11:29:22 -07: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
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
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
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
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Diana Huang
0c3af96792 Add the javascript to control payment button back in. 2013-09-03 14:35:38 -04:00