Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

272 Commits

Author SHA1 Message Date
Renzo Lucioni
10cb7f10fa Fix cosmetic issues with the split payment and verification flow 
Use honor code ribbon if verification status is not missing, submitted, or approved; title column on payment confirmation page holding dollar amounts more appropriately
 2015-01-09 13:13:00 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
David Baumgold
30b572b1b1 Merge pull request #6489 from edx/replace-edx-platform-name 
Replace "edX" with {platform_name}
 2015-01-08 16:36:54 -05:00
Dennis Jen
d2660e530f Merge branch 'release' 
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
 2015-01-08 15:02:26 -05:00
David Baumgold
44b792ab26 Replace "edX" with {platform_name} 2015-01-08 11:32:26 -05:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0 
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
 2015-01-06 15:24:12 -05:00
Renzo Lucioni
fe691b051b Apply most important copy changes from docs 2015-01-06 11:31:12 -05:00
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute 
TNL-997
 2015-01-06 17:21:49 +05:00
Renzo Lucioni
fb013272b8 Wrap full name placeholder in quotes to deal with spaces 
Also fix failing JS test which was looking for a removed button.
 2015-01-05 16:31:55 -05:00
Renzo Lucioni
e9e1d35060 ECOM-869 Update copy and hide supplementary content wrapper and requirement blocks if user is inactive 2015-01-05 15:31:36 -05:00
AlasdairSwan
686905d9a2 ECOM-811 design and layout changes 
Copy clean up
 2014-12-31 12:07:35 -05:00
Will Daly
cbfb6a8290 Do not escape HTML in verify/payment error messages 2014-12-30 09:46:36 -08:00
AlasdairSwan
8eb484c109 ECOM-811 design and layout changes 2014-12-30 06:53:59 -08:00
Will Daly
d3459be05a Add Jasmine tests for the payment/verification flow. 2014-12-22 13:25:49 -05:00
Will Daly
368dbf2ed8 Merge pull request #6293 from edx/will/set-donation-amount 
Preserve the contribution amount specified on the track selection page.
 2014-12-19 08:44:07 -05:00
Renzo Lucioni
f2e83bf57f Split payment/verification business intelligence analytics 
Track verify now and verify later choices, image captures, image retake, and name changes, as well as virtual pageviews for every step in the new flow(s).
 2014-12-17 17:08:10 -05:00
Will Daly
5109a862e0 Preserve the contribution amount specified on the track selection page. 2014-12-17 15:35:31 -05:00
Will Daly
df46e843c1 Merge pull request #6271 from edx/will/show-receipt-take-two 
Add payment information to payment confirmation page
 2014-12-17 10:01:50 -05:00
Will Daly
2ea2b8f674 Add JSON end-point for shoppingcart receipt information 
Add enrollment confirmation page

Fix progress update

Add order info to the payment confirmation page.
 2014-12-16 20:40:13 -05:00
stephensanchez
96e22097b2 Add the activate account step to the verified workflow. 
Changing approach such that email activation is not a step.

Removing stale line of code.

Update activate account step according to new UI changes.

Adding new test for activation.
 2014-12-16 20:24:50 +00:00
Will Daly
b4a8302e66 Merge pull request #6268 from edx/will/simplify-template-loading 
Inline underscore templates; add pre render step
 2014-12-16 11:42:06 -05:00
Renzo Lucioni
9faddd9b64 Merge pull request #6267 from edx/renzo/remove-webcam-approve-button 
Remove webcam capture approval button (checkmark)
 2014-12-16 11:15:49 -05:00
Renzo Lucioni
94b22bcde9 Remove webcam capture approval button (checkmark) 2014-12-16 10:01:55 -05:00
Will Daly
80f5d4216a Inline underscore templates; add pre render step 2014-12-16 08:38:28 -05:00
Will Daly
788cc350dd Merge pull request #6260 from edx/will/combine-intro-and-make-payment 
Combine payment and intro step
 2014-12-15 14:59:26 -05:00
Renzo Lucioni
9874a8d396 Use current full name as placeholder text 2014-12-15 14:25:31 -05:00
Will Daly
d3c3f73428 Combine payment and intro step 2014-12-15 13:23:07 -05:00
Will Daly
93cc03a570 Separate verification / payment flow. 2014-12-15 13:11:33 -05:00
Adam Palay
c0b87d87ab fix typo on course payment page (ECOM-714) 2014-12-03 10:52:34 -05:00
Adam Palay
bc8d0a9976 disable "go to payment button" on click (ECOM-643) 2014-11-14 12:22:30 -05:00
AlasdairSwan
790ac3f3ef Merge pull request #5915 from edx/alasdair/rwd-trackselection 
ECOM-574 Updated track selection page to be responsive
 2014-11-10 16:41:50 -05:00
AlasdairSwan
23081f076b ECOM-574 Updated track selection page to be responsive 2014-11-10 15:39:17 -05:00
Renzo Lucioni
17a3f556fb Fix track selection header copy 2014-11-04 13:54:31 -05:00
Will Daly
f9b5a9173f Redirect users to the track selection page or ?next page when using third party auth 
Set marketing site logged in cookie from third party auth.
 2014-10-28 10:28:30 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
Calen Pennington
183e04106a Merge pull request #5392 from cpennington/escape-course-ids-in-html 
Properly escape CourseKeys and UsageKeys in html templates
 2014-10-01 12:32:54 -04:00
Calen Pennington
77a04daa07 Properly escape CourseKeys and UsageKeys in html templates 
[LMS-11372]
[LMS-11370]
 2014-10-01 10:26:52 -04:00
Frances Botsford
b889f9ef11 fixes for status for prof ed and verified registration on both variants of AB test 2014-09-24 14:11:18 -04:00
frances botsford
4e1aa77b99 Merge pull request #5303 from edx/diana/update-prof-ed-flow 
Change some text when in professional ed flow
 2014-09-23 12:44:58 -04:00
Frances Botsford
ef1ef98653 adjusting ID verified status to be just verified status 2014-09-22 16:10:23 -04:00
Diana Huang
c3f88f5def Change some text when in professional ed flow 
ECOM-96
 2014-09-19 14:18:15 -04:00
Renzo Lucioni
66187ab907 Clean up translated strings in registration page, dashboard, and track selection flow 2014-09-17 14:38:24 -04:00
Waqas Khalid
32d9234b39 Merge pull request #3880 from mlkwaqas/waqas/lms2646-create-order-list-index-error 
Handle the indexerror exception on create_order
 2014-09-05 17:07:46 +05:00
Jesse Zoldak
814f6b9144 Fix capitilization on verified flow 2014-09-04 11:05:47 -04:00
Waqas Khalid
d11aaec3a1 Handle the indexerror exception on create_order 
LMS-2646
 2014-09-02 19:08:53 +05:00
Waheed Ahmed
bedb8830f6 Fixed typo on student id verification. 
LMS-11249
 2014-08-28 18:33:07 +05:00
Will Daly
f26e88bdd9 Fix messaging for professional ed under auto-registration 2014-08-19 07:53:26 -04:00
marco
6f810836db Template changes for course track AB-test 2014-08-15 10:26:29 -04:00
Diana Huang
9aa095dd21 Adapt flow for new 'professional' mode. 
ECOM-41
 2014-08-12 18:44:46 +00:00
Diana Huang
cfc3b46c5c Allow verified to be offered without audit 2014-08-05 09:32:38 -04:00