summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update link to templates documentationupdate-template-doc-linkCarlton Gibson2015-09-301-1/+1
* Merge pull request #668 from diox/fix-templatefilterMathieu Pillard2015-09-263-7/+16
|\
| * Fix TemplateFilter breakageMathieu Pillard2015-09-263-7/+16
|/
* Merge pull request #667 from diox/override_settings_in_testsMathieu Pillard2015-09-261-291/+291
|\
| * Refactor offline tests to make them always use override_settingsMathieu Pillard2015-09-261-291/+291
|/
* Merge pull request #572 from FlightDataServices/multiple-offline-contextsMathieu Pillard2015-09-254-38/+178
|\
| * Add support for multiple offline contexts.Nick Pope2015-09-254-38/+178
* | Merge pull request #663 from karyon/beatifulsoupMathieu Pillard2015-09-256-44/+77
|\ \ | |/ |/|
| * On py27, run tests with bs4Johannes Linke2015-09-251-1/+1
| * Make requirements/tests.txt python3 compatible by using bs4Johannes Linke2015-09-251-1/+1
| * Documentation: don't require beautifulsoup<4.0Johannes Linke2015-09-251-1/+1
| * Overwrite some tests for bs4 to account for the changed behaviourJohannes Linke2015-09-251-0/+38
| * Refactor and fix beautifulsoup version selection in the testsJohannes Linke2015-09-251-19/+16
| * Adapt Beautifulsoup parser to changed behaviour in bs4Johannes Linke2015-09-251-1/+7
| * Refactor and fix beautifulsoup version selection in the parserJohannes Linke2015-09-251-15/+13
| * Enable beautifulsoup tests for beautifulsoup v4Johannes Linke2015-09-251-6/+0
|/
* Merge pull request #653 from karyon/always_apply_absoluteMathieu Pillard2015-09-243-9/+61
|\
| * Add a testJohannes Linke2015-09-242-0/+47
| * Apply CssAbsoluteFilter to precompiled css even when compression is disabledJohannes Linke2015-09-241-9/+14
|/
* Merge pull request #652 from karyon/variousMathieu Pillard2015-09-246-79/+81
|\
| * Fix a deprecation warningJohannes Linke2015-09-231-1/+1
| * Minor refactoring in compress templatetag: part 2Johannes Linke2015-09-232-26/+42
| * Minor refactoring in compress templatetagJohannes Linke2015-09-231-14/+2
| * Minor refactoring in Compressor's constructorJohannes Linke2015-09-233-9/+8
| * Minor refactoring in precompile methodJohannes Linke2015-09-231-29/+28
|/
* Merge pull request #665 from karyon/fix_sekizai_double_renderingMathieu Pillard2015-09-225-4/+22
|\
| * contrib.sekizai: fix double-rendering: use TextNode, not TemplateDaniel Hahler2015-09-223-2/+19
| * Applied TextNode fix to sekizai postprocessor, fixes the double render issue....Aaron Croyle2015-09-222-2/+3
|/
* Merge pull request #662 from alecklandgraf/patch-1Mathieu Pillard2015-09-211-4/+4
|\
| * Update reactjs.txtAleck Landgraf2015-09-201-4/+4
|/
* Merge pull request #660 from carltongibson/test-updatesCarlton Gibson2015-09-172-10/+1
|\
| * Remove Django 1.5 and 1.6 from tox and travisCarlton Gibson2015-09-162-10/+1
* | Merge pull request #658 from karyon/use_static_dir_firstMathieu Pillard2015-09-162-13/+67
|\ \ | |/ |/|
| * sanitize settings overriding in CompressorInDebugModeTestCaseJohannes Linke2015-09-152-16/+21
| * In debug mode, use the app's static dir firstAurélien Bompard2015-09-152-13/+62
* | Merge pull request #659 from treyhunner/add-codecovMathieu Pillard2015-09-162-2/+6
|\ \ | |/ |/|
| * Switch from coveralls to codecov badgeTrey Hunner2015-09-151-2/+2
| * Use codecov to measure code coverageTrey Hunner2015-09-151-0/+4
|/
* Merge pull request #657 from karyon/remove_silent_exception_catchingMathieu Pillard2015-09-149-91/+85
|\
| * stop tests from leaking changed settingsJohannes Linke2015-09-148-78/+80
| * remove silent exception catchingJohannes Linke2015-09-141-13/+5
|/
* Merge pull request #656 from diox/no-sudoMathieu Pillard2015-09-141-3/+1
|\
| * Remove sudo from .travis.yml to run on travis new architectureMathieu Pillard2015-09-141-3/+1
|/
* Merge pull request #650 from karyon/developMathieu Pillard2015-09-108-9/+98
|\
| * CachedCompilerFilter: also cache empty filesJohannes Linke2015-09-102-2/+11
| * fix cached precompiler for unicode inputJohannes Linke2015-09-103-3/+9
| * fix testsJohannes Linke2015-09-101-11/+15
| * Document COMPRESS_CACHEABLE_PRECOMPILERS settingPindi Albert2015-09-061-0/+13
| * Only cache precompilers specified in COMPRESS_CACHEABLE_PRECOMPILERS setting,...Pindi Albert2015-09-066-18/+49
| * Add unit tests for compiler cachePindi Albert2015-09-061-0/+17