Commits · 1ecba9a95412c88ed8098a9224f23b271c0963fd · edx / edx-platform · GitLab

25 Mar, 2016 1 commit
- Setting request timeouts for edx notes. · 1ecba9a9
```
TNL-2444
```
  muzaffaryousaf committed Mar 25, 2016
  1ecba9a9 Browse Files
24 Mar, 2016 4 commits
- Merge pull request #11834 from edx/waheed/ecom-2948-move-white-label-sites-to-logistration · 6541ce3e
```
Moved white label sites to logistration.
```
  Waheed Ahmed committed Mar 24, 2016
  6541ce3e Browse Files
- Moved white label sites to logistration. · b8a447c1
```
ECOM-2948
```
  Waheed Ahmed committed Mar 24, 2016
  b8a447c1 Browse Files
- Merge pull request #11850 from edx/ai/tnl3964-forum-vote-button · 40dcb510
```
Fix styling of vote button in forums responses.
```
  attiyaIshaque committed Mar 24, 2016
  40dcb510 Browse Files
- Merge pull request #11910 from edx/ned/safe-templates-1 · 69339390
```
Safe templates for static_templates
```
  Ned Batchelder committed Mar 23, 2016
  69339390 Browse Files
23 Mar, 2016 29 commits
- Merge pull request #11911 from edx/renzo/safe-templates · 40ef82d5
```
Secure templates used to inject Segment and Optimizely
```
  Renzo Lucioni committed Mar 23, 2016
  40ef82d5 Browse Files
- Safe templates for static_templates · e53e5d9d
  Ned Batchelder committed Mar 23, 2016
  
  e53e5d9d Browse Files
- Merge pull request #11914 from edx/aleffert/sidebar-template · f0d8d48a
```
Mark register-sidebar template safe by default
```
  Akiva Leffert committed Mar 23, 2016
  f0d8d48a Browse Files
- Merge pull request #11894 from edx/schen/xss-fix-dashboard-course-upsell · d8714472
```
Escape properly the elements on the dashboard xseries upsell template
```
  Simon Chen committed Mar 23, 2016
  d8714472 Browse Files
- Merge branch 'master' into schen/xss-fix-dashboard-course-upsell · 97590928
  Simon Chen committed Mar 23, 2016
  
  97590928 Browse Files
- Merge pull request #11917 from edx/efischer/fix_safe_linter · 41c1c30f
```
Safe template linter should use DOTALL
```
  Eric Fischer committed Mar 23, 2016
  41c1c30f Browse Files
- Safe template linter should use DOTALL · 7cfa0fa1
```
MULTILINE has to do with how '^' and '$' behave, DOTALL will make the
'.' match newlines as well. This catches several failures that were
previously missed.
```
  Eric Fischer committed Mar 23, 2016
  7cfa0fa1 Browse Files
- Merge pull request #11912 from edx/dan-f/fix-accidental-extra-escaping · 08ddeca4
```
Fix accidental extra escaping
```
  Daniel Friedman committed Mar 23, 2016
  08ddeca4 Browse Files
- Escape properly the elements on the dashboard xseries upsell template · 79783800
  Simon Chen committed Mar 23, 2016
  
  79783800 Browse Files
- Mark register-sidebar template safe by default · d44b4d28
  Akiva Leffert committed Mar 23, 2016
  
  d44b4d28 Browse Files
- Fix accidental extra escaping · 56b11962
  Daniel Friedman committed Mar 23, 2016
  
  56b11962 Browse Files
- Secure templates used to inject Segment and Optimizely · a104d82e
  Renzo Lucioni committed Mar 23, 2016
  
  a104d82e 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 branch 'master' into ai/tnl3964-forum-vote-button · 1e74f942
  attiyaIshaque committed Mar 23, 2016
  
  1e74f942 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 6 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