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

27604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
519d55585c Revert "Testeng/jenkins revisited" 2014-12-31 12:25:54 -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
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
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
Chris Dodge
b80b347ed0 Make SessionMiddleware Microsite aware 2014-12-29 12:06:24 -05:00
chrisndodge
d4de932c2b Merge pull request #6386 from edx/cdodge/WL-137-normalize-user-profile-meta-column 
[WL-137] allow for student profile downloads to query into 'meta' field in the Us...
 2014-12-29 11:16:27 -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
Sarina Canelake
5855587a96 Merge pull request #6379 from edx/improve-i18n-courseware-page 
Improve i18n for courseware page

Merging from an airplane! w00t
 2014-12-27 18:02:55 -05:00
Jonathan Piacenti
6e4ccfb7bd Added Jasmine tests for always_cohort_inline_discussions. 2014-12-26 18:03:51 +00:00
Alan Boudreault
68fcdcc030 Add always_cohort_inline_discussions in course settings 2014-12-26 18:03:50 +00:00
Jesse Zoldak
db331b7fa9 Merge pull request #6382 from edx/zoldak/fix-master 
Revert "Better i18n for credit card charge failures"
 2014-12-26 12:41:50 -05: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
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
Christina Roberts
d97bf059bb Merge pull request #6366 from edx/christina/fix-editing-bug 
Revert #6192. It was causing a JS error on devstack.
 2014-12-23 17:04:57 -05:00
cahrens
6846e25bbb Revert #6192. It was causing a JS error on devstack. 
TNL-1070
 2014-12-23 16:13:45 -05:00
David Baumgold
fa6299cf61 Merge pull request #6309 from edx/db/edx-studio-as-format-string 
Replace "edX Studio" with "{studio_name}"
 2014-12-23 15:41:03 -05:00
David Baumgold
320941e850 Add settings comment about STUDIO_NAME and STUDIO_SHORT_NAME 2014-12-23 13:32:15 -05:00
David Baumgold
34c6415527 Use STUDIO_SHORT_NAME for Studio 
STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
 2014-12-23 11:14:58 -05:00
John Eskew
0d874def09 Merge pull request #6350 from edx/jeskew/asset_md_contract_fix 
Change contracts to allow user_id with type long().
 2014-12-23 11:11:05 -05:00
Fred Smith
cc0789a104 Merge pull request #6355 from edx/release 
Release
 2014-12-23 08:32:58 -05:00
Jesse Zoldak
05ca4c4645 Merge pull request #6343 from jzoldak/zoldak/quiet-factory-debug-msgs 
Quiet factory debug msgs for troubleshooting failing lms unit tests
 2014-12-22 17:18:16 -05:00