Commits · 88df456414c0e5381e7c9bece0055e7d4063729c · edx / edx-platform · GitLab

17 Feb, 2016 1 commit
- set show_full_result_count false · 88df4564
```
ECOM-2831
```
  Ahsan Ulhaq committed Feb 17, 2016
  88df4564 Browse Files
16 Feb, 2016 21 commits
- Merge pull request #11059 from edx/robrap/TNL-3425 · 6cc8bbff
```
Properly escape Studio base.html
```
  Robert Raposa committed Feb 16, 2016
  6cc8bbff Browse Files
- Merge pull request #11552 from edx/perf/speed-up-contentstore-tests · d3c88d70
```
Switch to SharedModuleStoreTestCase in the 'contentstore' app where possible.
```
  Toby Lawrence committed Feb 16, 2016
  d3c88d70 Browse Files
- Merge pull request #11557 from edx/sylvia/DOC-2692-2 · b9ccff75
```
Update screenshot for Help modal on Pages page
```
  srpearce committed Feb 16, 2016
  b9ccff75 Browse Files
- Make base.html Mako template safe by default · b69c6d62
```
Make base.html Mako template safe by default by:
1. Add page-level default of html escaping
2. Fix escaping of all variables in base.html
3. Fix escaping of all dependent underscore templates
Also includes additional best practices for certificates and
textbooks JavaScript/Underscore in order to complete that work.

TNL-3425
```
  Robert Raposa committed Feb 16, 2016
  b69c6d62 Browse Files
- Merge pull request #11416 from edx/schen/ECOM-3177 · 3fa62a6f
```
ECOM-3177 fix flaky js tests on dashboard.TrackEvents
```
  Simon Chen committed Feb 16, 2016
  3fa62a6f Browse Files
- Merge pull request #11364 from edx/kelketek/drag-and-drop · ddd7b617
```
Add Drag-and-drop XBlock to requirements.
```
  Kelketek committed Feb 16, 2016
  ddd7b617 Browse Files
- Update screenshot for Help modal on Pages page · a858bb9b
  Sylvia Pearce committed Feb 16, 2016
  
  a858bb9b Browse Files
- Remove duplicate test setup. · af102a69
  Toby Lawrence committed Feb 16, 2016
  
  af102a69 Browse Files
- Merge pull request #11508 from edx/sylvia/DOC-2692 · b68beea4
```
Update help text for Pages page in Studio to reflect Courseware-Course etc change
```
  srpearce committed Feb 16, 2016
  b68beea4 Browse Files
- Merge pull request #11553 from edx/schen/ECOM-3640 · 4b8a7371
```
ECOM-3640 add a new info log message on program certificate task to mark successful task completion
```
  Simon Chen committed Feb 16, 2016
  4b8a7371 Browse Files
- ECOM-3177 fix the flaky js test by doing dependency injection · f6fc711c
  Simon Chen committed Feb 16, 2016
  
  f6fc711c Browse Files
- Quality fixes. · fe545e05
  Toby Lawrence committed Feb 16, 2016
  
  fe545e05 Browse Files
- Merge pull request #11465 from edx/perf/speed-up-courseware-tests · 96544493
```
Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
```
  Toby Lawrence committed Feb 16, 2016
  96544493 Browse Files
- ECOM-3640 add a new info log message on program certificate task to mark successful task completion · 2f595c11
  Simon Chen committed Feb 16, 2016
  
  2f595c11 Browse Files
- Switch to SharedModuleStoreTestCase in the 'contentstore' app where possible. · e2cbb547
  Toby Lawrence committed Feb 16, 2016
  
  e2cbb547 Browse Files
- Merge pull request #11495 from edx/aj/tnl4115-improve-log-get-course-section · 31853d49
```
Use Course ID in logging an exception
```
  Awais Jibran committed Feb 16, 2016
  31853d49 Browse Files
- Merge pull request #11548 from edx/ziafazal/fix-get-template-path · 57af11c0
```
WL-320: fixed get_template_path to work with absolute path also
```
  Zia Fazal committed Feb 16, 2016
  57af11c0 Browse Files
- More quality fixes. · 49d3a7d3
  Toby Lawrence committed Feb 16, 2016
  
  49d3a7d3 Browse Files
- Merge pull request #11494 from edx/saleem-latif/WL-307 · cd101d5d
```
WL-307: correct FAVICON_PATH setting for comprehensive theming
```
  Saleem Latif committed Feb 16, 2016
  cd101d5d Browse Files
- fixed get_template_path to work with absolute path also · 6cd26575
```
fixed quality violation

skipped test in CMS

changes after feedback from mattd
```
  Zia Fazal committed Feb 16, 2016
  6cd26575 Browse Files
- Quality fixes. · ead2f047
  Toby Lawrence committed Feb 15, 2016
  
  ead2f047 Browse Files
15 Feb, 2016 3 commits
- Add Drag-and-drop XBlock to requirements. · 97593f19
  Jonathan Piacenti committed Feb 15, 2016
  
  97593f19 Browse Files
- Merge pull request #11433 from open-craft/smarnach/studio-add-xblock · 8280e224
```
Pass DOM element, not jQuery object to XBlock initialisation.
```
  Sven Marnach committed Feb 15, 2016
  8280e224 Browse Files
- correct FAVICON_PATH setting for comprehensive theming · 75f17ecc
  Saleem Latif committed Feb 15, 2016
  
  75f17ecc Browse Files
12 Feb, 2016 15 commits
- Merge pull request #11535 from edx/peter-fogg/add-lettuce-cache · 5e9577bf
```
Add accidentally deleted lettuce DB cache.
```
  Peter Fogg committed Feb 12, 2016
  5e9577bf Browse Files
- Merge pull request #11534 from edx/christina/jquery-npm · 36fc6162
```
Install underscore from npm.
```
  Christina Roberts committed Feb 12, 2016
  36fc6162 Browse Files
- Merge pull request #11539 from edx/jsa/fix-retry-comment · a052a304
```
adjust comment about program certification retry
```
  Jim Abramson committed Feb 12, 2016
  a052a304 Browse Files
- adjust comment about program certification retry · f71e7cac
  Jim Abramson committed Feb 12, 2016
  
  f71e7cac Browse Files
- Merge pull request #11522 from edx/gabe/remove-ga-fields · fcfb0f4a
```
copy event on write
```
  Gabe Mulley committed Feb 12, 2016
  fcfb0f4a Browse Files
- Merge pull request #11520 from edx/jsa/ecom-3638 · fb3a09e6
```
Specify high priority queue for credentials generation task.
```
  Jim Abramson committed Feb 12, 2016
  fb3a09e6 Browse Files
- Add accidentally deleted lettuce DB cache. · b6ca05d9
  Peter Fogg committed Feb 12, 2016
  
  b6ca05d9 Browse Files
- Merge pull request #11510 from edx/benp/TE-1194-example · 526e1748
```
TE-1194 update for test_teams.
```
  Ben Patterson committed Feb 12, 2016
  526e1748 Browse Files
- Install underscore from npm. · c6922684
```
FEDX-47
```
  cahrens committed Feb 12, 2016
  c6922684 Browse Files
- Merge pull request #11528 from edx/andya/add-js-monitoring-package · b46648ee
```
Add monitoring version of package.json
```
  Andy Armstrong committed Feb 12, 2016
  b46648ee Browse Files
- specify routing / queue for program credentials task. · 46ad8a33
```
ECOM-3638
```
  jsa committed Feb 12, 2016
  46ad8a33 Browse Files
- Disable credentials-related settings/tests under cms. · 8a620640
  jsa committed Feb 12, 2016
  
  8a620640 Browse Files
- Add monitoring version of package.json · 7a6495ce
  Andy Armstrong committed Feb 12, 2016
  
  7a6495ce Browse Files
- Merge pull request #11527 from edx/renzo/unclosed-p-tag · 4c79aba0
```
Close unclosed p tag
```
  Renzo Lucioni committed Feb 12, 2016
  4c79aba0 Browse Files
- Merge pull request #11519 from edx/jibsheet/document-nose-breakpoints-twice · 4037b16a
```
Copy this doc up from the bok_choy tests.
```
  Kevin Falcone committed Feb 12, 2016
  4037b16a Browse Files