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

4537 Commits

Author SHA1 Message Date
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
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
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
swdanielli
b009ac8f41 testcases for RecommenderXBlock 
This involves moving from edx-private to github
 2014-12-29 18:21:35 -05:00
chrisndodge
7d8a977990 Merge pull request #6336 from edx/cdodge/wl-171-record-enrollment-ids 
WL-171 when enrolling a student from a PaidCourseRegistration or a Registration...
 2014-12-29 13:55:07 -05:00
Will Daly
de8ac6ae3a Merge pull request #6377 from edx/will/hook-up-receipt 
Verification/Payment: Redirect from old receipt page
 2014-12-29 10:33:47 -08:00
Will Daly
c68426c390 Redirect from old receipt page 2014-12-29 09:38:33 -08:00
Chris Dodge
8ad7a64f98 when enrolling a student from a PaidCourseRegistration or a RegistrationCode redemption, then note the CourseEnrollment id in the respective tables 2014-12-29 12:07:56 -05:00
Chris Dodge
34d200ffd5 allow for student profile downloads to query into 'meta' field in the UserProfile json blob 2014-12-29 10:22:57 -05:00
Alan Boudreault
68fcdcc030 Add always_cohort_inline_discussions in course settings 2014-12-26 18:03:50 +00:00
Jesse Zoldak
6122f9c9ee Revert "Better i18n for credit card charge failures" 
This reverts commit 619a5ea3eb.
 2014-12-26 09:10:01 -05:00
David Baumgold
619a5ea3eb Better i18n for credit card charge failures 2014-12-24 15:17:45 -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
Stephen Sanchez
9bd1f3a8d7 Merge pull request #6327 from edx/sanchez/logging-verified-split 
Adding a number of logging messages for verification process.
 2014-12-22 10:49:29 -05:00
Awais Qureshi
cf83a3cc2c Merge pull request #6323 from edx/awais786/ECOM-759 
ECOM-759  if course is none return 404 error code.
 2014-12-22 20:39:35 +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
Awais
9d9f0c2f75 ECOM-759 if course is none return 404 error code. 2014-12-22 14:48:32 +05:00
Sarina Canelake
ccb5bfbc9a Merge pull request #6244 from wwj718/patch-1 
variable name error
 2014-12-19 17:41:00 -05:00
stephensanchez
33f62685a8 Adding a number of logging messages for verification process. 2014-12-19 20:43:49 +00:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release 
Release
 2014-12-19 13:23:22 -05:00
Adam
526bc9637b Merge pull request #6231 from edx/adam/fix-unenroll-enroll-inst-dash 
fix enrollment issue in instructor dash (ECOM-776)
 2014-12-19 11:53:53 -05:00
Calen Pennington
84a2eeb812 Merge pull request #6209 from edx/plat/fix-pure-system 
Fix PureSystem so that runtime.publish() works for a pure XBlock.
 2014-12-19 10:19:42 -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
Brian Wilson
2faff29a21 Fix PureSystem so that runtime.publish() works for a pure XBlock. 
Fix extracted from https://github.com/edx/edx-platform/pull/6035.
 2014-12-19 09:00:32 -05:00
Calen Pennington
61ba910255 Add a test of pure xblock and xmodule event publishing 2014-12-19 08:55:42 -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
Don Mitchell
d73eca48ba Merge pull request #6296 from edx/dhm/studio_asides 
make asides render in studio
 2014-12-18 15:41:58 -05:00
Ben Patterson
f2293b9508 Quiet analytics.init stderr output for tests. 2014-12-18 13:21:52 -05:00
chrisndodge
f733d1d8bd Merge pull request #6234 from edx/afzaledx/WL-172-order-history 
WL-172 Show a Order History list on the Student Dashboard for any PaidCo...
 2014-12-17 20:46:54 -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
Don Mitchell
4360a78142 Studio render XBlockAside views 
PLAT-280
 2014-12-17 15:44:49 -05:00
Will Daly
5109a862e0 Preserve the contribution amount specified on the track selection page. 2014-12-17 15:35:31 -05:00
Don Mitchell
de5e88561f Make XmlModuleStore handle asides 
PLAT-221
 2014-12-17 13:51:10 -05:00
Diana Huang
18deda9342 Merge pull request #6270 from edx/diana/track-refunds 
Add tracking for refunds.
 2014-12-17 10:44:53 -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
Waheed Ahmed
d23e772dd0 Fixed unicode problem if transcript file is not UTF-8 encoded. 
TNL-527
 2014-12-17 13:19:47 +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
Stephen Sanchez
2341bf1d1b Merge pull request #6272 from edx/sanchez/change-skip-step-logic 
Positive filtering which steps can be skipped.
 2014-12-16 15:38:30 -05:00
Diana Huang
f3c26c895e Add tracking for refunds. 2014-12-16 15:23:28 -05:00
stephensanchez
c84a604949 Positive filtering which steps can be skipped. 2014-12-16 18:20:41 +00:00
Renzo Lucioni
cdcd5d79fe Fix unit test failure due to stale urls.py 2014-12-16 12:09:01 -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
dfcbcd5435 Add a verification reminder to order confirmation emails 2014-12-16 10:28:33 -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
chrisndodge
c46c247e46 Merge pull request #6262 from edx/cdodge/also-sort-in-courses-list 
also apply sorting rules overrides to the /courses view
 2014-12-15 15:34:39 -05:00