Commits · 234691e446dc871290518c2bcf57f86cc557298a · edx / edx-platform · GitLab

30 Dec, 2014 8 commits
- Merge pull request #6396 from edx/will/ecom-848 · 234691e4
```
ECOM-848: No Flash Detected Error; HTML rendering as text
```
  Will Daly committed Dec 30, 2014
  234691e4 Browse Files
- Merge pull request #4786 from aboudreault/inline-discusssion-cohorting · 2eab51ab
```
Add always_cohort_inline_discussions in course settings
```
  Jim Abramson committed Dec 30, 2014
  2eab51ab Browse Files
- Do not escape HTML in verify/payment error messages · cbfb6a82
  Will Daly committed Dec 30, 2014
  
  cbfb6a82 Browse Files
- Merge pull request #6364 from edx/alasdair/decoupled-verified · 487bac51
```
ECOM-811 design and layout changes
```
  AlasdairSwan committed Dec 30, 2014
  487bac51 Browse Files
- Merge pull request #6376 from edx/improve-i18n-dashboard-course-listing · c28bed2b
```
Improve i18n on the LMS dashboard course listing page
```
  David Baumgold committed Dec 30, 2014
  c28bed2b Browse Files
- ECOM-811 design and layout changes · 8eb484c1
  AlasdairSwan committed Dec 30, 2014
  
  8eb484c1 Browse Files
- Improve i18n on the LMS dashboard course listing page · 4ec0295b
```
Adding translator comments to the dashboard.

Updating alt text to verification pending ribbon.

fix tests
```
  David Baumgold committed Dec 30, 2014
  4ec0295b Browse Files
- Merge pull request #4845 from edx/danielli/recommender · 4020313e
```
testcases for RecommenderXBlock
```
  swdanielli committed Dec 29, 2014
  4020313e Browse Files
29 Dec, 2014 10 commits
- testcases for RecommenderXBlock · b009ac8f
```
This involves moving from edx-private to github
```
  swdanielli committed Dec 29, 2014
  b009ac8f Browse Files
- Merge pull request #6394 from edx/aria-labelledby · 612d8db5
```
Should be aria-labelledby
```
  David Baumgold committed Dec 29, 2014
  612d8db5 Browse Files
- role=dialog · 908e85e0
  David Baumgold committed Dec 29, 2014
  
  908e85e0 Browse Files
- Should be aria-labelledby · a3572bdb
  David Baumgold committed Dec 29, 2014
  
  a3572bdb Browse Files
- Merge pull request #6336 from edx/cdodge/wl-171-record-enrollment-ids · 7d8a9779
```
WL-171 when enrolling a student from a PaidCourseRegistration or a Registration...
```
  chrisndodge committed Dec 29, 2014
  7d8a9779 Browse Files
- Merge pull request #6377 from edx/will/hook-up-receipt · de8ac6ae
```
Verification/Payment: Redirect from old receipt page
```
  Will Daly committed Dec 29, 2014
  de8ac6ae Browse Files
- Redirect from old receipt page · c68426c3
  Will Daly committed Dec 29, 2014
  
  c68426c3 Browse Files
- when enrolling a student from a PaidCourseRegistration or a RegistrationCode… · 8ad7a64f
```
when enrolling a student from a PaidCourseRegistration or a RegistrationCode redemption, then note the CourseEnrollment id in the respective tables
```
  Chris Dodge committed Dec 29, 2014
  8ad7a64f Browse Files
- Merge pull request #6386 from edx/cdodge/WL-137-normalize-user-profile-meta-column · d4de932c
```
[WL-137] allow for student profile downloads to query into 'meta' field in the Us...
```
  chrisndodge committed Dec 29, 2014
  d4de932c Browse Files
- allow for student profile downloads to query into 'meta' field in the UserProfile json blob · 34d200ff
  Chris Dodge committed Dec 29, 2014
  
  34d200ff Browse Files
27 Dec, 2014 1 commit
- Merge pull request #6379 from edx/improve-i18n-courseware-page · 5855587a
```
Improve i18n for courseware page

Merging from an airplane! w00t
```
  Sarina Canelake committed Dec 27, 2014
  5855587a Browse Files
26 Dec, 2014 4 commits
- Added Jasmine tests for always_cohort_inline_discussions. · 6e4ccfb7
  Jonathan Piacenti committed Dec 26, 2014
  
  6e4ccfb7 Browse Files
- Add always_cohort_inline_discussions in course settings · 68fcdcc0
  Alan Boudreault committed Dec 26, 2014
  
  68fcdcc0 Browse Files
- Merge pull request #6382 from edx/zoldak/fix-master · db331b7f
```
Revert "Better i18n for credit card charge failures"
```
  Jesse Zoldak committed Dec 26, 2014
  db331b7f Browse Files
- Revert "Better i18n for credit card charge failures" · 6122f9c9
```
This reverts commit 619a5ea3.
```
  Jesse Zoldak committed Dec 26, 2014
  6122f9c9 Browse Files
24 Dec, 2014 3 commits
- Better i18n for credit card charge failures · 619a5ea3
  David Baumgold committed Dec 24, 2014
  
  619a5ea3 Browse Files
- Improve i18n for courseware page · dff919ef
  David Baumgold committed Dec 24, 2014
  
  dff919ef Browse Files
- Merge pull request #6330 from edx/cdodge/filter-unpurchased-coupons · 64fb434d
```
[WL-186] only display the count for coupon redemptions that actually went through...
```
  chrisndodge committed Dec 24, 2014
  64fb434d Browse Files
23 Dec, 2014 7 commits
- Merge pull request #6366 from edx/christina/fix-editing-bug · d97bf059
```
Revert #6192. It was causing a JS error on devstack.
```
  Christina Roberts committed Dec 23, 2014
  d97bf059 Browse Files
- Revert #6192. It was causing a JS error on devstack. · 6846e25b
```
TNL-1070
```
  cahrens committed Dec 23, 2014
  6846e25b Browse Files
- Merge pull request #6309 from edx/db/edx-studio-as-format-string · fa6299cf
```
Replace "edX Studio" with "{studio_name}"
```
  David Baumgold committed Dec 23, 2014
  fa6299cf Browse Files
- Add settings comment about STUDIO_NAME and STUDIO_SHORT_NAME · 320941e8
  David Baumgold committed Dec 23, 2014
  
  320941e8 Browse Files
- Use STUDIO_SHORT_NAME for Studio · 34c64155
```
STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
```
  David Baumgold committed Dec 23, 2014
  34c64155 Browse Files
- Merge pull request #6350 from edx/jeskew/asset_md_contract_fix · 0d874def
```
Change contracts to allow user_id with type long().
```
  John Eskew committed Dec 23, 2014
  0d874def Browse Files
- Merge pull request #6355 from edx/release · cc0789a1
```
Release
```
  Fred Smith committed Dec 23, 2014
  cc0789a1 Browse Files
22 Dec, 2014 7 commits
- Merge pull request #6343 from jzoldak/zoldak/quiet-factory-debug-msgs · 05ca4c46
```
Quiet factory debug msgs for troubleshooting failing lms unit tests
```
  Jesse Zoldak committed Dec 22, 2014
  05ca4c46 Browse Files
- Change contracts to allow user_id with type long(). Add tests. · 1ad08cc3
  John Eskew committed Dec 22, 2014
  
  1ad08cc3 Browse Files
- Merge pull request #6345 from edx/hotfix/third-party-auth-inactive-linked-fix · de22ccd5
```
Send the user to the login page if registering with a linked but inactiv...
```
  Will Daly committed Dec 22, 2014
  de22ccd5 Browse Files
- Merge pull request #6344 from jzoldak/zoldak/better-ff-msg · 8f6cb60c
```
Improve the message to console for the wrong FireFox version
```
  Jesse Zoldak committed Dec 22, 2014
  8f6cb60c Browse Files
- Merge pull request #6333 from edx/will/pay-and-verify-js-tests · fe01291d
```
Jasmine tests for verification / payment; small bugfixes
```
  Will Daly committed Dec 22, 2014
  fe01291d Browse Files
- Add Jasmine tests for the payment/verification flow. · d3459be0
  Will Daly committed Dec 22, 2014
  
  d3459be0 Browse Files
- Send the user to the login page if registering with a linked but inactive account · 30549bd7
  Will Daly committed Dec 22, 2014
  
  30549bd7 Browse Files