Commits · ac951c4bd287dd5c4a3ae51723f06376cf9a8f12 · edx / edx-platform · GitLab

23 Mar, 2016 8 commits
- XSS escape cms/templates/course_info.html · ac951c4b
  Calen Pennington committed Mar 23, 2016
  
  ac951c4b Browse Files
- XSS escape cms/templates/component.html · 53a29609
  Calen Pennington committed Mar 23, 2016
  
  53a29609 Browse Files
- XSS escape cms/templates/js/asset.underscore · 7922dcbb
  Calen Pennington committed Mar 23, 2016
  
  7922dcbb Browse Files
- XSS escape cms/templates/js/asset-library.underscore · 485c5428
  Calen Pennington committed Mar 23, 2016
  
  485c5428 Browse Files
- XSS escape cms/templates/asset_index.html · b91d1f22
  Calen Pennington committed Mar 23, 2016
  
  b91d1f22 Browse Files
- XSS escape cms/templates/activation_active.html · 2607f8a9
  Calen Pennington committed Mar 23, 2016
  
  2607f8a9 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 29 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
- Merge pull request #11853 from edx/rc/2016-03-22 · 8f8ed776
```
Release Candidate rc/2016-03-22
```
  Simon Chen committed Mar 22, 2016
  8f8ed776 Browse Files
- Merge pull request #11797 from edx/christina/fix-improper-escaping · e2c4131a
```
Fix improper escaping.
```
  Eric Fischer committed Mar 22, 2016
  e2c4131a Browse Files
- Merge pull request #11759 from edx/awais786/ECOM-2931-update-credit-eligible-email · 4f5589e3
```
Add the providers information in the email.
```
  Awais Qureshi committed Mar 22, 2016
  4f5589e3 Browse Files
- Adding the ecom api functionality for the credentials. · a154e7f1
```
ECOM-2931
```
  Awais committed Mar 22, 2016
  a154e7f1 Browse Files
- Change to output as you go · 52efa68b
  Robert Raposa committed Mar 21, 2016
  
  52efa68b Browse Files
- Fix review comments · 0538dea9
```
Changes include:
- Fix code review comments
- Add comments
- Rename variables and files
```
  Robert Raposa committed Mar 21, 2016
  0538dea9 Browse Files
21 Mar, 2016 3 commits
- Fix flaky condition that's showing up in firefox 42. · 66cf6ffb
  Ben Patterson committed Mar 21, 2016
  
  66cf6ffb Browse Files
- Fix improper escaping. · 358ed255
  cahrens committed Mar 21, 2016
  
  358ed255 Browse Files
- Merge pull request #11855 from edx/benp/smarter-lms-sharding · 7c5a9da7
```
Builds: empty xunit file as a function.
```
  Ben Patterson committed Mar 21, 2016
  7c5a9da7 Browse Files