Commit Graph

1366 Commits

Author SHA1 Message Date
Carlton Gibson 366d8d06b8 Merge pull request #821 from carltongibson/patch/2.1.1-changes
Add 2.1.1 changes
2017-02-03 16:07:56 +01:00
Carlton Gibson 8be7d0f3ab Formatting changes 2017-02-03 15:54:21 +01:00
Carlton Gibson 206aaca310 Add Changes for 2.1.1 2017-02-03 15:21:55 +01:00
Mathieu Pillard e2b7a3efda Release 2.1.1 to fix #819 (packaging issue) 2017-02-02 11:38:34 +01:00
Mathieu Pillard 40038803b6 Release 2.1 2016-08-09 18:10:23 +02:00
Mathieu Pillard 51ec27f54f Merge pull request #788 from scop/codecov-badge
Use https in codecov URLs, fixes badge in GitHub view
2016-08-04 18:32:18 +02:00
Ville Skyttä 7e6a19ab32 Use https in codecov URLs, fixes badge in GitHub view 2016-08-04 18:54:43 +03:00
Mathieu Pillard 7f5a743951 Merge pull request #787 from scop/with
Handle more stream closing with "with"
2016-08-04 11:17:28 +02:00
Mathieu Pillard f75a27a05a Merge pull request #786 from scop/test110
Test with Django 1.10
2016-08-04 11:16:22 +02:00
Ville Skyttä 85795f7d80 Handle more stream closing with "with" 2016-08-04 11:45:53 +03:00
Ville Skyttä 720945d811 Test with Django 1.10 2016-08-04 11:03:39 +03:00
Ville Skyttä 20b2d578c1 Simplify Travis config a bit 2016-08-04 11:02:30 +03:00
karyon 6b62725441 Merge pull request #771 from karyon/remote_storages_docs
Remote storages docs: clarify result
2016-06-05 19:35:25 +02:00
Johannes Linke 30ef2ba99a Tweak last commit 2016-06-01 21:58:59 +02:00
Camilo Nova b8f0b85d58 Remote storages docs: Make it clear how it should look when finished 2016-06-01 21:58:59 +02:00
karyon 36e8f34c4d Merge pull request #770 from karyon/clarify_offline_compression
Clarify offline compression
2016-06-01 21:57:08 +02:00
Johannes Linke 0994320118 Docs: Clarify offline compression. Fixes #680. 2016-06-01 21:44:14 +02:00
Johannes Linke 62c68c9fd5 Docs: Don't give jinja2 two entries in the TOC 2016-06-01 21:44:14 +02:00
karyon 1958a39dd3 Merge pull request #766 from camilonova/patch-1
Tweak package name
2016-06-01 21:13:34 +02:00
Mathieu Pillard b6c635b6bb Merge pull request #768 from adamchainz/readthedocs.io
Convert readthedocs link for their .org -> .io migration for hosted projects
2016-05-31 21:17:48 +02:00
Adam Chainz 9be43b8100 Convert readthedocs link for their .org -> .io migration for hosted projects
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
2016-05-31 19:27:39 +01:00
Camilo Nova 3031cf4b45 Tweak package name 2016-05-18 11:04:58 -05:00
Mathieu Pillard 35087735a0 Merge pull request #758 from grzegorzswica/support-inheritance-in-offline-compression-using-a-variable
#674 Support inheritance in offline compression using a variable
2016-05-11 11:59:50 +02:00
Grzegorz Świca c0010bf2ae Use COMPRESS_OFFLINE_CONTEXT in offline templates discovery
Test case for template inheritance with variable from context and super
Test case for template inheritance with variable from context
2016-05-11 11:13:45 +02:00
karyon 512ecf2565 Merge pull request #762 from intellisense/patch-1
Fixing CssAbsoluteFilter changes double quotes to single quotes which causes svg to fail
2016-05-10 20:05:08 +02:00
Aamir Adnan 2e4ea7bfa9 Fixing CssAbsoluteFilter changes double quotes to single quotes which causes svg to fail
Fix for issue #738

adding test to check css url wrapped with double quotes

removing maxDiff which was added just for testing

If url not wrapped with quotes let it be

reverting last change and improving code
2016-05-10 22:15:26 +05:00
karyon 3551fd5c0e Merge pull request #757 from karyon/readme_changes
Reword README
2016-05-10 18:19:12 +02:00
Johannes Linke f87f631225 Update README: Mention support of coffeescript and sass and compatible django versions 2016-05-10 18:14:26 +02:00
karyon ee7d15a6d7 Merge pull request #749 from BriggsThompson/remote-storage-documentation
Updating remote storages documentation for CachedS3BotoStorage bug.
2016-05-10 18:07:40 +02:00
karyon f5c1469c8e Merge pull request #751 from akolpakov/issue_750
#750 CompilerFilter fails with UnicodeDecodeError when cache is used
2016-04-27 22:31:16 +02:00
karyon 69d1ab18ef Merge pull request #761 from mrazzari/patch-1
Minor docs clarification on COMPRESS_OFFLINE.
2016-04-27 22:27:16 +02:00
Manuel Razzari 3282332f48 Minor docs clarification on COMPRESS_OFFLINE.
From #680

> If you have the flag set, does the compression still happens at request time? 

This was a bit confusing due to "also" in the description implying that should offline fail, the full compress flow would be used as fallback. 
Added a link to further info.
2016-04-27 17:17:12 -03:00
Andrey Kolpakov 0b89bcb039 test for #750 2016-04-25 22:25:16 +02:00
karyon e5a7df5221 Merge pull request #760 from karyon/patch-2
Compress command: Don't crash on UnicodeDecodeError
2016-04-24 10:43:45 +02:00
Matt Robenolt e3ebcf7b47 Compress command: Don't crash on UnicodeDecodeError 2016-04-24 09:34:11 +02:00
karyon d219949551 Merge pull request #741 from scop/ignore-eggs
Ignore .eggs dir
2016-04-18 22:05:37 +02:00
karyon f49e806467 Merge pull request #745 from jaddison/django-1.10
Fixing 1.10 compatibility issues
2016-04-18 22:04:56 +02:00
karyon d1ea3df0f8 Merge pull request #756 from grzegorzswica/fix-options-conversion-in-compile-filter
Use proper options dict for conversion to tuple in CompilerFilter
2016-04-18 21:31:53 +02:00
Grzegorz Świca 616c41ced1 Test case for options dict in CompilerFilter 2016-04-15 15:25:19 +02:00
Grzegorz Świca 81bbeee5e6 Use proper options dict for conversion to tuple 2016-04-15 14:04:57 +02:00
Andrey Kolpakov 19938a7da7 #750 CompilerFilter fails with UnicodeDecodeError when cache is used 2016-03-12 22:47:02 +01:00
Briggs Thompson 90b29b3072 Updating remote storages documentation for CachedS3BotoStorage bug.
The example in the docs doesn't quite work as the file stored in
the "content" variable is already closed, and ends up spitting out
encoded data to the destination files. It was properly being sent
to S3, but not getting saved locally.

This saves the file locally first, then using local storage, opens
the file once again for the S3BotoStorage save call.
2016-03-07 21:37:27 -06:00
James Addison e86ccfd29c Fixing 1.10 compatibility issues relating to Django's dropping of optparse in favour of argparse. 2016-02-26 16:38:23 -08:00
Ville Skyttä 9d03b0434c Ignore .eggs dir 2016-02-03 19:13:51 +02:00
Mathieu Pillard 38cbfdb389 Merge pull request #740 from jonklo/develop
Updated required django-appconf version
2016-02-03 15:40:43 +01:00
Jon 0be7712271 Updated required django-appconf version. 2016-02-03 15:30:37 +01:00
Mathieu Pillard bf912df0e6 Also remove the downloads count badge, no need for it. 2016-01-22 18:23:46 +01:00
Mathieu Pillard 493884670b Merge pull request #732 from django-compressor/update-pypi-badge
Fix pypi badge
2016-01-22 18:21:00 +01:00
Mathieu Pillard 2bce70956b Fix pypi badge 2016-01-22 18:20:26 +01:00
Mathieu Pillard 33aafe709a Merge branch 'master' into develop
(I merged #726 into master by accident)
2016-01-22 18:10:23 +01:00