Ulrich Petri 68df68833b Merge branch 'master' into offline ...

Conflicts:
	.gitignore
	tests/settings.py

Moved offline test template to new location.

2011-01-28 00:01:55 +01:00

..

conf

Merge branch 'master' into offline

2011-01-28 00:01:55 +01:00

filters

Use Popen.communicate instead of handling std in and out manually.

2011-01-13 21:15:49 +01:00

management

Merge branch 'master' into offline

2011-01-28 00:01:55 +01:00

templates/compressor

Changed whitespace in the CSS link-tag.

2010-12-01 18:13:42 +09:00

templatetags

Merge branch 'master' into offline

2011-01-28 00:01:55 +01:00

tests

Merge branch 'master' into offline

2011-01-28 00:01:55 +01:00

__init__.py

Removed a few API-only imports from the main module.

2011-01-20 12:54:40 +01:00

base.py

Using the settings of django_compressor.

2011-01-11 21:03:03 +01:00

cache.py

Added ability to use a different cache backend.

2010-09-16 11:34:33 +02:00

css.py

Removed a few API-only imports from the main module.

2011-01-20 12:54:40 +01:00

exceptions.py

Refactored the compressor code a little (split in separate modules). Also abstracted the file parsing and added a BeautifulSoupParser and a LxmlParser, while the former is the default.

2010-06-07 15:01:36 +02:00

js.py

Removed a few API-only imports from the main module.

2011-01-20 12:54:40 +01:00

parser.py

Refactored the compressor code a little (split in separate modules). Also abstracted the file parsing and added a BeautifulSoupParser and a LxmlParser, while the former is the default.

2010-06-07 15:01:36 +02:00

storage.py

Make the default compressor storage a lazy object to not load the storage class on module level.

2010-07-02 11:33:01 +02:00

utils.py

Merge branch 'master' into offline

2011-01-28 00:01:55 +01:00