Commits · 558281a09dbabc376ad26ff94a24904492df25b1 · edx / edx-platform · GitLab

19 May, 2016 7 commits
- Merge pull request #12516 from edx/ned/update-translations · 558281a0
```
Update translations (autogenerated message)
```
  Ned Batchelder committed May 19, 2016
  558281a0 Browse Files
- Merge pull request #12492 from edx/ned/fix-csv-headers · 9351b302
```
Ensure correct CSV headers for non-English
```
  Ned Batchelder committed May 19, 2016
  9351b302 Browse Files
- Update translations (autogenerated message) · 6c60f731
  Ned Batchelder committed May 19, 2016
  
  6c60f731 Browse Files
- Merge pull request #12471 from edx/ned/release-translations · 6142c76c
```
Support named-release translation files.
```
  Ned Batchelder committed May 19, 2016
  6142c76c Browse Files
- Merge pull request #12512 from edx/diana/enable-verify-xss · 49e66863
```
turn on bok choy XSS checking
```
  Diana Huang committed May 19, 2016
  49e66863 Browse Files
- Merge pull request #12510 from edx/douglashall/WL-450/fixed_timeout_issue · d95ad325
```
WL-450 Fix for issue with canceling changes to image upload fields
```
  Douglas Hall committed May 19, 2016
  d95ad325 Browse Files
- Merge pull request #12441 from edx/aj/ecom4202-disable-gen-cert-exception-btn · 4f46716e
```
Disable `Generate Exception Certificate button
```
  Awais Jibran committed May 19, 2016
  4f46716e Browse Files
18 May, 2016 30 commits
- Add tests for the new commands · 7aa1c1c2
  Ned Batchelder committed May 18, 2016
  
  7aa1c1c2 Browse Files
- Merge pull request #12513 from edx/christina/mark-flaky-tests · 95ffe7cd
```
Christina/mark flaky tests
```
  Christina Roberts committed May 18, 2016
  95ffe7cd Browse Files
- Merge pull request #12503 from edx/bjacobel/FEDX-194-more-math-input-issues · 3faaead6
```
Fix another kind of math problem which was overflowing
```
  Brian Jacobel committed May 18, 2016
  3faaead6 Browse Files
- Enable VERIFY_XSS checking by default. · 1162dbc1
  Diana Huang committed May 18, 2016
  
  1162dbc1 Browse Files
- Merge pull request #12490 from edx/robrap/linter-mako · 94adf7fb
```
TNL-4566: Lint Mako templates outside of expressions
```
  Robert Raposa committed May 18, 2016
  94adf7fb Browse Files
- Merge pull request #12511 from edx/andya/exclude-deletions-from-safe-commit-linting · 9e81c4cc
```
Exclude deleted files from safe template linting
```
  Robert Raposa committed May 18, 2016
  9e81c4cc Browse Files
- Merge pull request #12483 from edx/douglashall/SOL-1776/add_studio_acceptance_tests · 6eb2e184
```
SOL-1776 Added Studio settings image upload acceptance tests
```
  Douglas Hall committed May 18, 2016
  6eb2e184 Browse Files
- Merge pull request #12481 from edx/fix-memory-leak · 55bfb74c
```
clear request cache after celery task finishes (TNL-2705)
```
  Adam committed May 18, 2016
  55bfb74c Browse Files
- Mark test as flaky. · a80773f8
```
SOL-1811
```
  cahrens committed May 18, 2016
  a80773f8 Browse Files
- Enhance safe template linter. · cf3ef8aa
```
- Lint directories and files in sorted order.
- Lint python blocks in Mako.
```
  Robert Raposa committed May 18, 2016
  cf3ef8aa Browse Files
- Make _thread_list_template.html safe. · 7ecbed43
  Robert Raposa committed May 18, 2016
  
  7ecbed43 Browse Files
- Mark test as flaky. · 2c7cdbff
```
TNL-4590
```
  cahrens committed May 18, 2016
  2c7cdbff Browse Files
- Merge pull request #12501 from edx/christina/tnl-1619-xss · 9f1971ce
```
Christina/tnl 1619 xss
```
  Christina Roberts committed May 18, 2016
  9f1971ce Browse Files
- Added Studio settings image upload acceptance tests · e2c65c57
  Douglas Hall committed May 18, 2016
  
  e2c65c57 Browse Files
- Wait for seek to complete before pressing play. · fd1d72cc
```
TNL-4540
```
  cahrens committed May 18, 2016
  fd1d72cc Browse Files
- remove logging · 04dd61be
  Adam Palay committed May 18, 2016
  
  04dd61be Browse Files
- Exclude deleted files from safe template linting · a7e754dd
  Andy Armstrong committed May 18, 2016
  
  a7e754dd Browse Files
- WL-450 Fix for issue with canceling changes to image upload fields · bb55917f
  Douglas Hall committed May 18, 2016
  
  bb55917f Browse Files
- Merge pull request #12491 from edx/peter-fogg/catalog-api-jwt-key · 06fa0839
```
Use the correct JWT key when authenticating against the course catalog API.
```
  Peter Fogg committed May 18, 2016
  06fa0839 Browse Files
- Merge pull request #12500 from edx/christina/tnl-1619 · 16e9f9c6
```
Can no longer play outside of the start/end time for the clip.
```
  Christina Roberts committed May 18, 2016
  16e9f9c6 Browse Files
- Ensure correct CSV headers for non-English · 17b16b11
```
If we pass non-ASCII strings to create_csv_response, it will call
unicode() on it, and fail with UnicodeDecodeError.  So pass Unicode
strings, or ASCII-only bytestrings for the headers.
```
  Ned Batchelder committed May 18, 2016
  17b16b11 Browse Files
- clear request cache after celery task finishes (TNL-2705) · a7d638de
```
set max_num_courses_in_cache on modulestore
```
  Adam Palay committed May 18, 2016
  a7d638de Browse Files
- Merge pull request #12443 from edx/shr/log/PLAT-1023-PLAT-1031-Detail-Logging · 3e747c37
```
Detail Logging xmodule exceptions
```
  Syed Hasan raza committed May 18, 2016
  3e747c37 Browse Files
- Merge pull request #12190 from edx/aj/sust-24-globalstaff-course-access · 2c5319e4
```
Aj/sust 24 globalstaff course access
```
  attiyaIshaque committed May 18, 2016
  2c5319e4 Browse Files
- Bokchoy Test Deleted. · 48e7fc81
  attiyaishaque committed May 18, 2016
  
  48e7fc81 Browse Files
- Change in Bokchoy test according to new design. · 275a31ec
  attiyaishaque committed May 18, 2016
  
  275a31ec Browse Files
- Unit tests added and changes in enroll_staff view. · 19ea9ae9
  attiyaishaque committed May 18, 2016
  
  19ea9ae9 Browse Files
- Adding unit test · b1926497
  attiyaishaque committed May 18, 2016
  
  b1926497 Browse Files
- Adding bokchoy test and change in html file. · 94b58c2d
  attiyaishaque committed May 18, 2016
  
  94b58c2d Browse Files
- SUST-24 Initial commit · 3fb65924
```
Add bokchoy test and changes in html
```
  Awais Jibran committed May 18, 2016
  3fb65924 Browse Files
17 May, 2016 3 commits
- Merge pull request #12502 from edx/clrux/ac-474 · 7b34f431
```
Corrects duplicate main element wrapper on Wiki article template
```
  clrux committed May 17, 2016
  7b34f431 Browse Files
- Merge pull request #12467 from edx/ahodges/xrefs · 214091d3
```
Updates and corrects href links to readthedocs
```
  Alison Hodges committed May 17, 2016
  214091d3 Browse Files
- Merge pull request #12495 from edx/jeskew/release_to_master_merge · e5a5704b
```
Merge release to master for 2016-05-17 release
```
  John Eskew committed May 17, 2016
  e5a5704b Browse Files