Commits · 5b6e2dd5ee309024f746d830c7023f2ffd29a595 · edx / edx-platform · GitLab

20 Dec, 2016 11 commits
- Merge pull request #14173 from edx/alisan/discussion-styles-fix-TNL-6187 · 5b6e2dd5
```
new inline discussion style fixes
```
  alisan617 committed Dec 20, 2016
  5b6e2dd5 Browse Files
- Merge pull request #14179 from edx/adam/fix-stringresponse-issue · 30c84118
```
Revert "tnl-4141 only whitespaces not allowed in answer and fixed the…
```
  Adam committed Dec 20, 2016
  30c84118 Browse Files
- discussion img upload dialog RTL and other clean-up · e28f42b1
  alisan617 committed Dec 20, 2016
  
  e28f42b1 Browse Files
- Revert "tnl-4141 only whitespaces not allowed in answer and fixed the pep8 violation." · c4c5a8e8
```
This reverts commit 3ad2f092.
```
  Adam Palay committed Dec 20, 2016
  c4c5a8e8 Browse Files
- Merge pull request #14177 from edx/naa/fix-marketing-pr · dec4034b
```
Fix Enrollment database access in Marketing Course URL PR
```
  Nimisha Asthagiri committed Dec 20, 2016
  dec4034b Browse Files
- Fix Enrollment database access in Marketing Course URL PR · f2483091
  Nimisha Asthagiri committed Dec 20, 2016
  
  f2483091 Browse Files
- Merge pull request #14176 from edx/ora_1_1_13_release · ef55cc4f
```
ORA2 1.1.13 release
```
  Albert (AJ) St. Aubin committed Dec 20, 2016
  ef55cc4f Browse Files
- ORA2 1.1.13 release · 872341ed
  Albert St. Aubin committed Dec 20, 2016
  
  872341ed Browse Files
- Merge pull request #14170 from edx/douglashall/session_cookie_domain_override · 934dcce1
```
Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio
```
  Douglas Hall committed Dec 20, 2016
  934dcce1 Browse Files
- Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio · 65f04205
  Douglas Hall committed Dec 20, 2016
  
  65f04205 Browse Files
- Merge pull request #14064 from edx/asadiqbal08/ENT-32-EC-branding · 122aa550
```
ENT-32 Show enterprise customer branding on Logistration.
```
  Asad Iqbal committed Dec 20, 2016
  122aa550 Browse Files
19 Dec, 2016 4 commits
- ENT-32 Show enterprise customer branding on Logistration. · 99f73dfb
```
nit: css
```
  asadiqbal committed Dec 20, 2016
  99f73dfb Browse Files
- Merge pull request #14092 from edx/cdyer/validate-capa-xml · aa3d6e87
```
Use new XMLString field type for CAPA data field.
```
  Cliff Dyer committed Dec 19, 2016
  aa3d6e87 Browse Files
- Merge pull request #14171 from edx/feanil/add_more_docs · 12d8cc50
```
Add more docs to the monitoring requirements file.
```
  Feanil Patel committed Dec 19, 2016
  12d8cc50 Browse Files
- Add more docs to the monitoring requirements file. · b05282ac
  Feanil Patel committed Dec 19, 2016
  
  b05282ac Browse Files
16 Dec, 2016 10 commits
- Merge pull request #14158 from edx/release · 6de2535e
```
Release
```
  sanfordstudent committed Dec 16, 2016
  6de2535e Browse Files
- Merge pull request #14161 from edx/andya/fix-discussion-ux-bugs · d3d3819f
```
Clean up discussion styling issues
```
  Andy Armstrong committed Dec 16, 2016
  d3d3819f Browse Files
- Merge pull request #14159 from edx/high-contrast-sliders · 467512ab
```
add hidden borders to video controls for high contrast mode
```
  Ari Rizzitano committed Dec 16, 2016
  467512ab Browse Files
- Merge pull request #14083 from edx/fix-unformatted-403 · 1b06bdee
```
fix unformatted html in studio error response
```
  Ari Rizzitano committed Dec 16, 2016
  1b06bdee Browse Files
- Clean up discussion styling issues · accbda34
```
TNL-6184
```
  Andy Armstrong committed Dec 16, 2016
  accbda34 Browse Files
- [video] add hidden borders to controls to support windows high contrast mode (AC-458) · b5b81759
```
[video] add hidden borders to video controls for high contrast mode (AC-458)

[video] minor border color adjustment (AC-458)

use variable names for colors

color variable names
```
  Ari Rizzitano committed Dec 16, 2016
  b5b81759 Browse Files
- [studio] fix unformatted html in connection error message (TNL-5818) · 311e6d7f
```
display default error message for non-json responses (TNL-5818)

[studio] log ajax errors. (TNL-5818)

[studio] fix failing test (TNL-5818)

[cms-test] avoid circular error logging; stub Logger (TNL-5818)

[cms-test] fix logger dep in squire config (TNL-5818)

[cms-tests] fix logger import (TNL-5818)

[cms-test] stub the logger directly in the karma config. (TNL-5818)

[studio] didn't need Logger after all (TNL-5818)

[studio] ignore console.log (TNL-5818)
```
  Ari Rizzitano committed Dec 16, 2016
  311e6d7f Browse Files
- Merge pull request #13590 from edx/mjevtic/SOL-2082 · 7d791ab9
```
[SOL-2082] Add a value to SiteConfiguration to enable ecommerce Receipt Page usage
```
  Marko Jevtić committed Dec 16, 2016
  7d791ab9 Browse Files
- [SOL-2082] Add a value to SiteConfiguration to enable ecommerce Receipt Page usage · 363a0c8d
  Marko Jevtic committed Dec 16, 2016
  
  363a0c8d Browse Files
- Merge pull request #14045 from edx/afzaledx/WL-829_add_programs_to_courses_view_context · 024e2e4b
```
Add programs list to the context for index.html and courses.html template.
```
  Afzal Wali Naushahi committed Dec 16, 2016
  024e2e4b Browse Files
15 Dec, 2016 12 commits
- Use new XMLString type for CAPA data field. · 22ce3003
```
TNL-5245
```
  J. Cliff Dyer committed Dec 15, 2016
  22ce3003 Browse Files
- Merge pull request #14148 from edx/release-candidate · 2125a21f
```
Bump problem-builder to v2.6.5.
```
  sanfordstudent committed Dec 15, 2016
  2125a21f Browse Files
- Merge pull request #14155 from edx/bjacobel/inline-discussion-redesign · c1cf4e78
```
Fix bug on new post creation 
```
  Brian Jacobel committed Dec 15, 2016
  c1cf4e78 Browse Files
- Merge pull request #14152 from juananpe/honorbrowserlangs · fd9c26b1
```
Honor browser defined language preferences when possible
```
  Gregory Martin committed Dec 15, 2016
  fd9c26b1 Browse Files
- Merge pull request #14138 from edx/alisan/new-post-discussion-TNL-6006 · 15794b93
```
Discussion new post form layout TNL-6006
```
  alisan617 committed Dec 15, 2016
  15794b93 Browse Files
- Merge pull request #14154 from edx/ned/update-translations · 486dae94
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Dec 15, 2016
  486dae94 Browse Files
- Fix bug on new post creation where we would try to hide an element that wasn't there · 0e5f6c2e
  Brian Jacobel committed Dec 15, 2016
  
  0e5f6c2e Browse Files
- new discussion post form layout · 41620e05
  alisan617 committed Dec 15, 2016
  
  41620e05 Browse Files
- Programs list conditionally added to the context of index and courses page. · e44e1859
  Afzal Wali committed Dec 15, 2016
  
  e44e1859 Browse Files
- Update translations (autogenerated message) · b56faaff
  Ned Batchelder committed Dec 15, 2016
  
  b56faaff Browse Files
- Merge pull request #13235 from edx/jia/MA-2684 · bde0f7b2
```
MA-2684: return correct marketing url for course about
```
  wajeeha-khalid committed Dec 15, 2016
  bde0f7b2 Browse Files
- MA-2684: return correct marketing url for course about · 11356965
  wajeeha-khalid committed Dec 15, 2016
  
  11356965 Browse Files
14 Dec, 2016 3 commits
- Honor browser defined language preferences when possible · 83d91fa7
  Juanan Pereira committed Dec 14, 2016
  
  83d91fa7 Browse Files
- Merge pull request #14026 from edx/bjacobel/inline-discussion-redesign · 71693c3a
```
Inline Discussion "two-level" redesign
```
  Brian Jacobel committed Dec 14, 2016
  71693c3a Browse Files
- Merge pull request #14149 from edx/revert-13441-honorbrowserdefinedlangs · 26413a57
```
Revert "Honor browser defined language preferences when possible"
```
  Jesse Zoldak committed Dec 14, 2016
  26413a57 Browse Files