Commits · b2dace8069bafb9da1c1c8cb32c488e8f679888f · edx / edx-platform

19 Apr, 2016 5 commits
- Merge pull request #11808 from CredoReference/adapt-asides-to-be-exported-to-xml · b2dace80
```
Adaptation asides to be exported to the XML
```
  Calen Pennington committed Apr 19, 2016
  b2dace80 Browse Files
- Merge pull request #12173 from edx/renzo/upgrade-management-commands · c643bdf7
```
Upgrade edx-management-commands to 0.1.1
```
  Renzo Lucioni committed Apr 19, 2016
  c643bdf7 Browse Files
- Merge pull request #12144 from Ayub-Khan/SUST-35-course_key_from_string_or_404 · 0becea94
```
SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404
```
  Ayub khan committed Apr 19, 2016
  0becea94 Browse Files
- fix flaky oauth test (#12168) · e8963598
  Adam committed Apr 19, 2016
  
  e8963598 Browse Files
- -fixed Tests. · 66f52ba6
  Ayub-khan committed Apr 19, 2016
  
  66f52ba6 Browse Files
18 Apr, 2016 8 commits
- Merge pull request #12106 from edx/awais786/ECOM-3199-xseries-certs-view · 298770e5
```
Adding background image for xseries certificates on dashboard side bar panel
```
  Awais Qureshi committed Apr 18, 2016
  298770e5 Browse Files
- Merge pull request #12178 from… · 75c0ec61
```
Merge pull request #12178 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs

Updated dashboard UI for empty list of courses and programs
```
  tasawernawaz committed Apr 18, 2016
  75c0ec61 Browse Files
- ECOM-3201 · b4e1e971
```
Updated dashboard UI for empty list of courses and programs
```
  tasawernawaz committed Apr 18, 2016
  b4e1e971 Browse Files
- Adding background image for xseries certificates on programs dashboard side bar panel. · 54058f6e
```
ECOM-3199
```
  Awais committed Apr 18, 2016
  54058f6e Browse Files
- -Addressed wrong course id comment. · 9e3f68c0
  Ayub-khan committed Apr 18, 2016
  
  9e3f68c0 Browse Files
- -Adressed all comments · e687f1e7
  Ayub-khan committed Apr 18, 2016
  
  e687f1e7 Browse Files
- Merge pull request #12133 from edx/atiya/TNL-4376-course-export-page · 717c36bd
```
Course export page will not be opened for course id that does not bel…
```
  attiyaIshaque committed Apr 18, 2016
  717c36bd Browse Files
- Course export page will not be opened for course id that does not belong to any course. · 4c15dd93
  attiyaishaque committed Apr 18, 2016
  
  4c15dd93 Browse Files
16 Apr, 2016 3 commits
- Merge pull request #12129 from edx/robrap/linter-mako · 069e884f
```
TNL-4324: Add check for HTML entities
```
  Robert Raposa committed Apr 16, 2016
  069e884f Browse Files
- Add check for HTML entities · 14abf32b
  Robert Raposa committed Apr 16, 2016
  
  14abf32b Browse Files
- Asides can be exported with the rest of courseware through the Export function within CMS · 0151a149
  Dmitry Viskov committed Apr 16, 2016
  
  0151a149 Browse Files
15 Apr, 2016 16 commits
- Upgrade edx-management-commands to 0.1.1 · 8304c968
  Renzo Lucioni committed Apr 15, 2016
  
  8304c968 Browse Files
- Merge pull request #12170 from edx/renzo/program-listing-bokchoy · a406a221
```
Acceptance tests for program listing page
```
  Renzo Lucioni committed Apr 15, 2016
  a406a221 Browse Files
- Acceptance tests for program listing page · 182e34f8
```
Includes a11y coverage. ECOM-3980.
```
  Renzo Lucioni committed Apr 15, 2016
  182e34f8 Browse Files
- Revert "Updated dashboard UI for empty list of courses and programs" (#12166) · 98b8b68d
  Adam committed Apr 15, 2016
  
  98b8b68d Browse Files
- Merge pull request #12167 from edx/release · 181b00b4
```
Merge patch release into master
```
  Muzaffar yousaf committed Apr 15, 2016
  181b00b4 Browse Files
- Merge pull request #11841 from CredoReference/copy_question_should_also_copy_tags · 33af47a7
```
Duplicate item in Studio should also duplicate related xblock aside
```
  Calen Pennington committed Apr 15, 2016
  33af47a7 Browse Files
- Merge pull request #12143 from edx/patch/2016-04-14 · 9808b154
```
Patch/2016-04-15
```
  Muzaffar yousaf committed Apr 15, 2016
  9808b154 Browse Files
- Merge pull request #12139 from edx/fix-certificate-display-issue · 7600d9b0
```
fix issue where the wrong text appeared for certificate generation hi…
```
  Adam committed Apr 15, 2016
  7600d9b0 Browse Files
- Merge pull request #12159 from edx/ned/update-translations · a2b06dc6
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Apr 15, 2016
  a2b06dc6 Browse Files
- Merge pull request #12148 from edx/add-logging-to-certs · f1a9f81e
```
Add logging to certs
```
  Adam committed Apr 15, 2016
  f1a9f81e Browse Files
- Merge pull request #12145 from edx/jia/TNL-3818-refactor · 014185ea
```
refactored variable name
```
  wajeeha-khalid committed Apr 15, 2016
  014185ea Browse Files
- -fixed failing tests · ef70d017
```
-Adressed all comments
```
  Ayub-khan committed Apr 15, 2016
  ef70d017 Browse Files
- Merge pull request #12153 from… · 00d2d6d2
```
Merge pull request #12153 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs-updated

Updated dashboard UI for empty list of courses and programs
```
  tasawernawaz committed Apr 15, 2016
  00d2d6d2 Browse Files
- ECOM-3201 · ba6ba40e
```
Updated dashboard UI for empty list of courses and programs
```
  tasawernawaz committed Apr 15, 2016
  ba6ba40e Browse Files
- Merge pull request #12156 from edx/renzo/merge-release-into-master · 5bb0e908
```
Manually merge release into master
```
  Renzo Lucioni committed Apr 15, 2016
  5bb0e908 Browse Files
- Reconcile double reverts · 60fab86f
```
Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.
```
  Andy Armstrong committed Apr 14, 2016
  60fab86f Browse Files
14 Apr, 2016 8 commits
- Merge pull request #12158 from edx/aleffert/formula-response-multi-device · a804d0e9
```
Enable multi-device for FormulaResponse
```
  Akiva Leffert committed Apr 14, 2016
  a804d0e9 Browse Files
- Merge pull request #12155 from edx/christina/allow-multiple-random-cohorts · 08a81642
```
Allow multiple random cohorts.
```
  Christina Roberts committed Apr 14, 2016
  08a81642 Browse Files
- Merge pull request #11438 from edx/clrux/ac-329 · 0c9f9d46
```
AC-329 making closed-captions draggable
```
  clrux committed Apr 14, 2016
  0c9f9d46 Browse Files
- Update translations (autogenerated message) · 958795d5
  Ned Batchelder committed Apr 14, 2016
  
  958795d5 Browse Files
- Rename "is_default_cohort" method. · 1cd54d5f
  cahrens committed Apr 14, 2016
  
  1cd54d5f Browse Files
- Enable multi-device for FormulaResponse · 9f5d4611
```
We've already audited this for responsiveness. Just need to turn it on.

JIRA: https://openedx.atlassian.net/browse/MA-1809
```
  Akiva Leffert committed Apr 14, 2016
  9f5d4611 Browse Files
- Merge pull request #12135 from edx/schen/ECOM-3195 · 582debcd
```
ECOM-3195 Edit the navigation header on dashboard to expose program listing page
```
  Simon Chen committed Apr 14, 2016
  582debcd Browse Files
- Video player: adding Dragabilly to closed captions · df5520bd
```
* tests for dragging
* icon location reference updates
* pattern library usage
```
  Chris Rodriguez committed Apr 14, 2016
  df5520bd Browse Files