Commits · 56b11962466bc5c1f115cd2a12129923761afd91 · edx / edx-platform · GitLab

23 Mar, 2016 17 commits
- Fix accidental extra escaping · 56b11962
  Daniel Friedman committed Mar 23, 2016
  
  56b11962 Browse Files
- Merge pull request #11893 from edx/dan-f/make-cms-activation_invalid-safe · 679cdc37
```
Make CMS activation_invalid template safe by default
```
  Daniel Friedman committed Mar 23, 2016
  679cdc37 Browse Files
- Merge pull request #11891 from edx/dan-f/make-cms-activation_complete-safe · 0b6faee4
```
Make CMS activation_complete template safe by default
```
  Daniel Friedman committed Mar 23, 2016
  0b6faee4 Browse Files
- Merge pull request #11902 from edx/zoldak/html-escape-mako-without-variables · 1b1f3952
```
Add h filter page directive to cms mako templates without variables
```
  Jesse Zoldak committed Mar 23, 2016
  1b1f3952 Browse Files
- Merge pull request #11896 from edx/mkatz/3pauthsafetemplate · c4a18db9
```
add filter to profile page
```
  Michael Katz committed Mar 23, 2016
  c4a18db9 Browse Files
- Merge pull request #11895 from edx/peter-fogg/linter-fixes · d28e0a27
```
Minor fixes to the safe template linter.
```
  Peter Fogg committed Mar 23, 2016
  d28e0a27 Browse Files
- Merge pull request #10705 from edx/mrehan/SUST-22 · 8459b5be
```
Implement 'from_string_or_404' in utils
```
  M. Rehan committed Mar 23, 2016
  8459b5be Browse Files
- Merge pull request #11892 from edx/peter-fogg/remove-teams-wires · 5d8a5d97
```
Remove old teams example templates.
```
  Peter Fogg committed Mar 23, 2016
  5d8a5d97 Browse Files
- Add h filter page directive to cms mako templates without variables · 6f0d1157
```
The files to change were found with:
`ack --literal --type=html --match '${' --files-without-matches cms/templates`
```
  Jesse Zoldak committed Mar 23, 2016
  6f0d1157 Browse Files
- Minor fixes to the safe template linter. · 6661063b
  Peter Fogg committed Mar 23, 2016
  
  6661063b Browse Files
- add filter · 4d6c7879
  Michael Katz committed Mar 23, 2016
  
  4d6c7879 Browse Files
- Make CMS activation_invalid template safe by default · 48e2299e
  Daniel Friedman committed Mar 23, 2016
  
  48e2299e Browse Files
- Remove old teams example templates. · 11bb2810
  Peter Fogg committed Mar 23, 2016
  
  11bb2810 Browse Files
- Make CMS activation_complete template safe by default · ea347c7a
  Daniel Friedman committed Mar 23, 2016
  
  ea347c7a Browse Files
- Implement 'from_string_or_404' util and its example usage. · 771a7d06
  Muhammad Rehan committed Mar 23, 2016
  
  771a7d06 Browse Files
- Merge pull request #11852 from edx/vkaracic/SOL-1712 · 88aa4a90
```
Change EcommerceService's is_enabled to accept User instead of request
```
  Vedran Karačić committed Mar 23, 2016
  88aa4a90 Browse Files
- Change EcommerceService's is_enabled to accept User instead of request · 3c8ae7c3
```
. And change the verification link in the sidebar to redirect to new basket if the EcommerceService is enabled.
```
  vkaracic committed Mar 23, 2016
  3c8ae7c3 Browse Files
22 Mar, 2016 23 commits
- Merge pull request #11884 from edx/mushtaq/edx-ora2-version-1.1.1 · 5deb07d9
```
ORA2 version update
```
  Mushtaq Ali committed Mar 23, 2016
  5deb07d9 Browse Files
- Merge pull request #11880 from edx/andya/add-ui-toolkit-only · c7336b3d
```
Add the UI Toolkit to edx-platform
```
  Andy Armstrong committed Mar 22, 2016
  c7336b3d Browse Files
- Merge pull request #11860 from edx/adam/fix-math-input-ajax · c9e1a860
```
TNL-4217 – Initialize preview once for an input for the first time
```
  M. Rehan committed Mar 23, 2016
  c9e1a860 Browse Files
- Add the UI Toolkit to edx-platform · 0177eede
```
UITK-75
```
  Andy Armstrong committed Mar 22, 2016
  0177eede Browse Files
- ORA2 version update to 1.1.1. Includes bug fixes for TNL-4268 · 1b60f731
  Mushtaq Ali committed Mar 23, 2016
  
  1b60f731 Browse Files
- Only add event listener if it hasn't been added yet · d3a467d3
  Adam Palay committed Mar 23, 2016
  
  d3a467d3 Browse Files
- Merge pull request #11867 from edx/benp/courseteam-flaky-fix · 33327219
```
Fix flaky condition that's showing up in firefox 42.
```
  Ben Patterson committed Mar 22, 2016
  33327219 Browse Files
- Merge pull request #11881 from edx/zoldak/TE-1235 · a77000a8
```
Remove executable bit from test file  TE-1235
```
  Jesse Zoldak committed Mar 22, 2016
  a77000a8 Browse Files
- Merge pull request #11758 from edx/christina/xss-tests · c97a6a51
```
Bok choy XSS changes
```
  Eric Fischer committed Mar 22, 2016
  c97a6a51 Browse Files
- Merge pull request #11869 from edx/benp/bok-choy-race-condition · 44c7c927
```
Wait for numerical selection to load before continuing.
```
  Ben Patterson committed Mar 22, 2016
  44c7c927 Browse Files
- Merge pull request #11873 from edx/release · f2b7ca6f
```
Merge release 2016-03-22 back to master 
```
  Simon Chen committed Mar 22, 2016
  f2b7ca6f Browse Files
- Merge pull request #11876 from edx/andya/revert-underscore-string-upgrade · 4796d4f7
```
Revert "Upgrade underscore.string.min.js."
```
  Andy Armstrong committed Mar 22, 2016
  4796d4f7 Browse Files
- Merge pull request #11875 from edx/adam/fix-typo · 6fc8da27
```
fix typo on testing.rst page
```
  Adam committed Mar 22, 2016
  6fc8da27 Browse Files
- Wait for numerical selection to load before continuing. · c6a2afa0
```
TNL-4272
```
  Ben Patterson committed Mar 22, 2016
  c6a2afa0 Browse Files
- Remove executable bit from test file TE-1235 · 7e79d335
  Jesse Zoldak committed Mar 22, 2016
  
  7e79d335 Browse Files
- Revert "Upgrade underscore.string.min.js." · e854690a
```
This reverts commit e5c7fdda.

Unfortunately this change broke bundling on sandboxes, so reverting
it so that master isn't left in a bad state.
```
  Andy Armstrong committed Mar 22, 2016
  e854690a Browse Files
- Merge pull request #11800 from edx/robrap/safe-template-linter · f150fd9b
```
TNL-4214: Add safe template linter
```
  Robert Raposa committed Mar 22, 2016
  f150fd9b Browse Files
- fix typo on testing.rst page · 82aad56e
  Adam Palay committed Mar 22, 2016
  
  82aad56e Browse Files
- Update bok-choy requirement · 6bb06e50
  Eric Fischer committed Mar 22, 2016
  
  6bb06e50 Browse Files
- Get environment variable for bok-choy-custom runs · be00a961
  Eric Fischer committed Mar 22, 2016
  
  be00a961 Browse Files
- Enabling XSS vulnerability flag for bok choy tests · 0c993788
  cahrens committed Mar 22, 2016
  
  0c993788 Browse Files
- Merge pull request #11874 from edx/efischer/mark_flaky · b95dadcf
```
Mark test as flaky TNL-4272
```
  Eric Fischer committed Mar 22, 2016
  b95dadcf Browse Files
- Mark test as flaky TNL-4272 · 9e71e3f3
  Eric Fischer committed Mar 22, 2016
  
  9e71e3f3 Browse Files