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

3982 Commits

Author SHA1 Message Date
chrisndodge
91a4796216 Merge pull request #6196 from edx/muhhshoaib/WL-168 
WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page
 2015-01-01 10:00:06 -05:00
AlasdairSwan
23da87f078 Merge pull request #6414 from edx/alasdair/decoupled-verified-state-copy-cleanup 
ECOM-811 design and layout changes
 2014-12-31 14:40:15 -05:00
David Baumgold
35ec36116c Merge pull request #6424 from edx/remove-useless-i18n 
Remove useless translation
 2014-12-31 14:25:27 -05:00
Will Daly
0ac14dce79 Merge pull request #6410 from edx/will/decouple-verified-ab-test 
Decouple verified/payment A/B test setup
 2014-12-31 10:39:49 -08:00
Ned Batchelder
598dc0ebd6 No point using translation for a string consisting only of a replacement. 2014-12-31 13:19:26 -05:00
AlasdairSwan
686905d9a2 ECOM-811 design and layout changes 
Copy clean up
 2014-12-31 12:07:35 -05:00
David Baumgold
92622f12a7 Merge pull request #6373 from edx/improve-i18n-receipt-page 
Improve i18n on shoppingcart
 2014-12-31 09:42:05 -05:00
Muhammad Shoaib
5a437b396e WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page 
improvements suggested by william
 2014-12-31 17:45:31 +05:00
David Baumgold
19c43725dd Merge pull request #6393 from edx/remove-useless-gettext 
HTML should not be i18ned
 2014-12-30 21:25:17 -05:00
David Baumgold
a2760ecc8e HTML should not be i18ned 2014-12-30 19:40:40 -05:00
Will Daly
a90f7ab1bf Enter the new verification / payment flow using a GET param 
Allow disabling of experiment
 2014-12-30 13:36:25 -08:00
Will Daly
234691e446 Merge pull request #6396 from edx/will/ecom-848 
ECOM-848: No Flash Detected Error; HTML rendering as text
 2014-12-30 10:54:12 -08:00
Jim Abramson
2eab51ab26 Merge pull request #4786 from aboudreault/inline-discusssion-cohorting 
Add always_cohort_inline_discussions in course settings
 2014-12-30 13:11:37 -05:00
Will Daly
cbfb6a8290 Do not escape HTML in verify/payment error messages 2014-12-30 09:46:36 -08:00
AlasdairSwan
487bac519e Merge pull request #6364 from edx/alasdair/decoupled-verified 
ECOM-811 design and layout changes
 2014-12-30 10:45:45 -05:00
AlasdairSwan
8eb484c109 ECOM-811 design and layout changes 2014-12-30 06:53:59 -08:00
David Baumgold
4ec0295bab Improve i18n on the LMS dashboard course listing page 
Adding translator comments to the dashboard.

Updating alt text to verification pending ribbon.

fix tests
 2014-12-30 14:24:15 +00:00
David Baumgold
fe1d244900 Respond to review comments 2014-12-30 09:20:16 -05:00
David Baumgold
2043c4d91b Improve i18n on shoppingcart receipt page 2014-12-30 09:20:16 -05:00
David Baumgold
908e85e079 role=dialog 2014-12-29 14:59:34 -05:00
David Baumgold
a3572bdbf8 Should be aria-labelledby 2014-12-29 14:48:58 -05:00
Alan Boudreault
68fcdcc030 Add always_cohort_inline_discussions in course settings 2014-12-26 18:03:50 +00:00
David Baumgold
dff919efb2 Improve i18n for courseware page 2014-12-24 14:56:28 -05:00
chrisndodge
64fb434dbf Merge pull request #6330 from edx/cdodge/filter-unpurchased-coupons 
[WL-186] only display the count for coupon redemptions that actually went through...
 2014-12-24 13:22:49 -05:00
Will Daly
d3459be05a Add Jasmine tests for the payment/verification flow. 2014-12-22 13:25:49 -05:00
Chris Dodge
6198b90051 only display the count for coupon redemptions that actually went through to purchase completion 2014-12-22 10:38:34 -05:00
Renzo Lucioni
3d717a895a Track upsell copy interaction, upgrade button and verify now button clicks on the dashboard 2014-12-19 17:03:14 -05:00
Renzo Lucioni
c42c2573b0 Merge pull request #6259 from edx/renzo/split-verification-payment-hookup 
Hook up new payment and verification flow
 2014-12-19 13:29:13 -05:00
Renzo Lucioni
988785545e Merge pull request #6311 from edx/renzo/photo-submission-confirmation-email 
Send confirmation email on successful photo submission
 2014-12-19 09:51:54 -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
1e4f890120 Send confirmation email on successful photo submission 2014-12-18 18:27:05 -05:00
Renzo Lucioni
ca8faf92cd Merge pull request #6294 from edx/renzo/split-verification-analytics 
Split payment/verification business intelligence analytics
 2014-12-18 09:39:14 -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
Afzal Wali
872dbb874b WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased 2014-12-17 16:19:06 -05:00
Will Daly
5109a862e0 Preserve the contribution amount specified on the track selection page. 2014-12-17 15:35:31 -05:00
John Jarvis
128d763047 Merge pull request #6218 from edx/jarv/env-revision-override 
optionally using environment variable for edx-platform hash
 2014-12-17 11:37:13 -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
Renzo Lucioni
a268c91236 Hook up new payment/verification flow to dashboard, track selection page, and upgrade 2014-12-16 23:32:17 -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
John Jarvis
a9d731165c optionally using environment variable for edx-platform hash 2014-12-16 15:13:08 -05: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
dfcbcd5435 Add a verification reminder to order confirmation emails 2014-12-16 10:28:33 -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
chrisndodge
cb1058ac00 Merge pull request #6142 from edx/muhhshoaib/WL-106-MIT-Course-Information-Page-side-bar 
MIT: Course Information Page side bar
 2014-12-15 20:46:22 -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