Commits · 4ead911f05b53ac053bdc985d9c71dd2e7a894fb · edx / edx-platform · GitLab

21 Dec, 2016 19 commits
- Merge pull request #14199 from cpennington/revert-wajeeha · 4ead911f
```
Fix quality issues
```
  Calen Pennington committed Dec 21, 2016
  4ead911f Browse Files
- Merge pull request #14196 from edx/release · bd87061f
```
Merge Release back into master
```
  Calen Pennington committed Dec 21, 2016
  bd87061f Browse Files
- Merge pull request #14197 from cpennington/fix-release-merge-conflict · 147639ab
```
Fix release merge conflict
```
  Calen Pennington committed Dec 21, 2016
  147639ab Browse Files
- Merge pull request #14189 from edx/yro_student-acct-timezone-fix · 59daa1c0
```
change variable name
```
  Gregory Martin committed Dec 21, 2016
  59daa1c0 Browse Files
- Merge remote-tracking branch 'edx/master' into release · a24ac515
  Calen Pennington committed Dec 21, 2016
  
  a24ac515 Browse Files
- Merge pull request #14193 from edx/release-candidate · b34d110b
```
Release candidate
```
  Calen Pennington committed Dec 21, 2016
  b34d110b Browse Files
- Fix quality issues · 3e0c8fb7
  Calen Pennington committed Dec 21, 2016
  
  3e0c8fb7 Browse Files
- Merge pull request #14190 from cpennington/revert-wajeeha · e6190c99
```
Revert Marketing URL changes
```
  Calen Pennington committed Dec 21, 2016
  e6190c99 Browse Files
- Revert "Merge pull request #13235 from edx/jia/MA-2684" · 04115bfe
```
This reverts commit bde0f7b2, reversing
changes made to 71693c3a.
```
  Calen Pennington committed Dec 21, 2016
  04115bfe Browse Files
- Revert "Merge pull request #14177 from edx/naa/fix-marketing-pr" · 7f942bfc
```
This reverts commit dec4034b, reversing
changes made to ef55cc4f.
```
  Calen Pennington committed Dec 21, 2016
  7f942bfc Browse Files
- Revert "Merge pull request #14187 from edx/jia/MA-3052" · 07865ce0
```
This reverts commit f7a0c1d9, reversing
changes made to dec4034b.
```
  Calen Pennington committed Dec 21, 2016
  07865ce0 Browse Files
- Merge pull request #14191 from edx/beryl/content_library_access · e860205e
```
Test retrieving subsection grade after losing access to block in subsection
```
  sanfordstudent committed Dec 21, 2016
  e860205e Browse Files
- Test retrieving subsection grade after losing access to block in subsection · d1d8d31b
  Nimisha Asthagiri committed Dec 21, 2016
  
  d1d8d31b Browse Files
- Merge pull request #14187 from edx/jia/MA-3052 · f7a0c1d9
```
MA-3052: avoid catalog integration for individual course when cached
```
  Calen Pennington committed Dec 21, 2016
  f7a0c1d9 Browse Files
- MA-3052: avoid catalog integration for individual course when cached · b5edd018
  wajeeha-khalid committed Dec 21, 2016
  
  b5edd018 Browse Files
- change variable name · ce76e2c3
  Gregory Martin committed Dec 21, 2016
  
  ce76e2c3 Browse Files
- Merge pull request #14151 from edx/sstudent/TNL-6178 · 74a66664
```
context manager for course id in context
```
  sanfordstudent committed Dec 21, 2016
  74a66664 Browse Files
- Merge pull request #14089 from asadazam93/asadazam/tnl-5487-invalid-usage-key · fc79fae5
```
TNL-5487 – Fix InvalidKeyError on render xblock
```
  AsadAzam committed Dec 21, 2016
  fc79fae5 Browse Files
- Merge pull request #14178 from edx/yro_set-default-timezone-settings · ff8c4a6e
```
add blankTitle option
```
  Gregory Martin committed Dec 20, 2016
  ff8c4a6e Browse Files
20 Dec, 2016 16 commits
- add blankTitle option · 909f35bb
  Gregory Martin committed Dec 20, 2016
  
  909f35bb Browse Files
- Merge pull request #14078 from edx/yro_remove-datetimetext-functions · 8c009881
```
remove datetext utils
```
  Gregory Martin committed Dec 20, 2016
  8c009881 Browse Files
- 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
- context manager for course id in context · ac9b8fba
  Sanford Student committed Dec 20, 2016
  
  ac9b8fba 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
- delete datetext functions, implement dateutils · b0bf19a7
  Gregory Martin committed Dec 20, 2016
  
  b0bf19a7 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
- Fix InvalidKeyError on render xblock · 01f3233a
  asadazam93 committed Dec 20, 2016
  
  01f3233a 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 1 commit
- Merge pull request #14158 from edx/release · 6de2535e
```
Release
```
  sanfordstudent committed Dec 16, 2016
  6de2535e Browse Files