Commits · 432c57062845e1b3086da28353d02d59e1ee722e · edx / edx-platform

31 Mar, 2016 2 commits
- XSS Safe default - header.html, navigation.html, help_modal.html · 432c5706
  Nimisha Asthagiri committed Mar 31, 2016
  
  432c5706 Browse Files
- XSS Safe Default - dashboard · 6eec5ac4
  Nimisha Asthagiri committed Mar 31, 2016
  
  6eec5ac4 Browse Files
23 Mar, 2016 1 commit
- XSS Safe by default - vert_module.html · 15e5a7db
  Nimisha Asthagiri committed Mar 23, 2016
  
  15e5a7db Browse Files
22 Mar, 2016 23 commits
- 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 14 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
- Merge pull request #11844 from edx/christina/delete-carousel · 46267466
```
Delete face_upload and responsive-carousel.
```
  Christina Roberts committed Mar 21, 2016
  46267466 Browse Files
- Merge pull request #11862 from edx/efischer/master_replay · 15205898
```
Escape full names
```
  Eric Fischer committed Mar 21, 2016
  15205898 Browse Files
- Merge pull request #11805 from edx/renzo/self-paced-modulestore-wrapper · a5b10ca0
```
Override field data within the XBlock runtime
```
  Renzo Lucioni committed Mar 21, 2016
  a5b10ca0 Browse Files
- Merge pull request #11861 from edx/efischer/escape_names · 6c6542ae
```
Escape full names
```
  Eric Fischer committed Mar 21, 2016
  6c6542ae Browse Files
- Properly escaping fullname · 90a72ddb
```
To prevent XSS attacks, we now properly escape any string containing
the user's fullname. Enumerated by searching webview.py for "fullname",
and "git grep"-ing any occurrences. This also exposed some unused strings,
which I deleted for clarity.
```
  Ayub-khan committed Mar 21, 2016
  90a72ddb Browse Files
- Properly escape the name · 0a8f6fa3
  Robert Raposa committed Mar 21, 2016
  
  0a8f6fa3 Browse Files
- Escape full name · 15ef27fe
```
TNL-3849/SEC-69
```
  Robert Raposa committed Mar 21, 2016
  15ef27fe Browse Files
- Properly escaping fullname · ce2fded1
```
To prevent XSS attacks, we now properly escape any string containing
the user's fullname. Enumerated by searching webview.py for "fullname",
and "git grep"-ing any occurrences. This also exposed some unused strings,
which I deleted for clarity.
```
  Ayub-khan committed Mar 21, 2016
  ce2fded1 Browse Files
- Properly escape the name · a8c4b929
  Robert Raposa committed Mar 21, 2016
  
  a8c4b929 Browse Files
- Escape full name · e18a44a0
```
TNL-3849/SEC-69
```
  Robert Raposa committed Mar 21, 2016
  e18a44a0 Browse Files
- Merge pull request #11712 from… · 7eb079df
```
Merge pull request #11712 from mitocw/enhancement/aq/prevent_ccx_creation_if_CCXConnector_is_set_mitocw#189

Prevented creation of new CCX in lms, when a CCXConnector URL is set on a course
```
  Peter Pinch committed Mar 21, 2016
  7eb079df Browse Files