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

27623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
0dbfd174e2 Merge pull request #6097 from edx/jeskew/fix_exception_on_fill_run 
When fill_in_run() fails, handle failure instead of exception.
 2015-01-05 09:03:56 -05:00
Jesse Zoldak
279e2e8200 Merge pull request #6432 from open-craft/annual-test-failures 
Fix two tests failing on January 1, 2015
 2015-01-02 17:48:45 -05:00
Braden MacDonald
877e231c7a Fix two tests failing on January 1, 2015 2015-01-02 12:25:26 -08:00
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
Will Daly
4589a97676 Merge pull request #6427 from edx/will/ecom-849 
Use disabled property to prevent IE9 users from clicking disabled buttons
 2014-12-31 13:20:54 -08:00
Will Daly
4203c1e545 Use disabled property to prevent IE9 users from clicking disabled buttons 2014-12-31 15:17:07 -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
400efdf153 Merge pull request #6421 from edx/will/ecom-850 
Set attempting_upgrade session flag in the new payment flow
 2014-12-31 11:04:28 -08:00
Will Daly
c183831b43 Merge pull request #6423 from edx/will/ecom-864 
Hide verification messaging if the user has an active verification
 2014-12-31 11:03:34 -08: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
Will Daly
c15adf9cd9 Set attempting_upgrade session flag in the new payment flow 2014-12-31 13:11:34 -05:00
Will Daly
01814c3983 Hide verification messaging if the user has an active verification 2014-12-31 13:01:56 -05:00
Jesse Zoldak
854c28f779 Merge pull request #6422 from edx/revert-6419-testeng/jenkins_revisited 
Revert "Testeng/jenkins revisited"
 2014-12-31 12:26:15 -05:00
Jesse Zoldak
519d55585c Revert "Testeng/jenkins revisited" 2014-12-31 12:25:54 -05:00
AlasdairSwan
686905d9a2 ECOM-811 design and layout changes 
Copy clean up
 2014-12-31 12:07:35 -05:00
Christine Lytwynec
7011e2c278 Merge pull request #6419 from edx/testeng/jenkins_revisited 
Testeng/jenkins revisited
 2014-12-31 11:40:29 -05:00
Christine Lytwynec
2018acbce3 use pip-accel if it is available, get .pip/download-cache from S3 
add script to upload/download pip cache directories from S3

update all-tests.sh to use pip-download-cache from S3

update pip-accel to version 0.22
 2014-12-31 11:29:26 -05:00
David Baumgold
55ad5b4dcd Merge pull request #6417 from edx/no-translate-target-blank 
target="_blank" should not be translated
 2014-12-31 10:18:43 -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
David Baumgold
4dd265a380 target="_blank" should not be translated 
https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-target
 2014-12-31 09:16:43 -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
Shrhawk
20c356bd89 Merge pull request #6400 from Shrhawk/shr/bug/TNL-998-orphaned-form-label 
Change label "for" value
 2014-12-31 12:23:14 +05:00
chrisndodge
77c68b7dbd Merge pull request #6037 from edx/cdodge/microsite-aware-session-middleware 
Allow for Microsite middleware to change cookie domains
 2014-12-30 23:43:24 -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
John Eskew
863bdc1712 When fill_in_run() fails, handle failure instead of exception. 2014-12-30 17:07:05 -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
David Baumgold
c28bed2b6d Merge pull request #6376 from edx/improve-i18n-dashboard-course-listing 
Improve i18n on the LMS dashboard course listing page
 2014-12-30 10:18:39 -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
08e90d2e99 Better i18n for credit card charge failures 2014-12-30 09:20:17 -05:00
David Baumgold
fe1d244900 Respond to review comments 2014-12-30 09:20:16 -05:00
David Baumgold
90e4de5c02 Pull HTML out of i18n'ed string 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
Syed Hassan Raza
55052c1aaf Change label for value 
TNL-998
 2014-12-30 15:19:35 +05:00
swdanielli
4020313e22 Merge pull request #4845 from edx/danielli/recommender 
testcases for RecommenderXBlock
 2014-12-29 20:59:31 -05:00
swdanielli
b009ac8f41 testcases for RecommenderXBlock 
This involves moving from edx-private to github
 2014-12-29 18:21:35 -05:00
David Baumgold
612d8db58a Merge pull request #6394 from edx/aria-labelledby 
Should be aria-labelledby
 2014-12-29 17:04:27 -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
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