Merge branch 'release/1.3' into develop

AUTHORS

@@ -13,18 +13,23 @@ Aaron Godfrey
 Adam "Cezar" Jenkins
 Adrian Holovaty
 Alen Mujezinovic
+Alex Kessinger
 Andreas Pelme
+Antti Hirvonen
 Apostolos Bessas
+Ashley Camba Garrido
 Atamert Ölçgen
 Aymeric Augustin
 Bartek Ciszkowski
 Ben Firshman
 Ben Spaulding
+Benjamin Gilbert
 Benjamin Wohlwend
 Bojan Mihelac
 Boris Shemigon
 Brad Whittington
 Bruno Renié
+Cassus Adam Banko
 Chris Adams
 Chris Streeter
 Clay McClure
@@ -34,7 +39,9 @@ Eugene Mirotin
 Fenn Bailey
 Francisco Souza
 Gert Van Gool
+Greg McGuire
 Harro van der Klauw
+Isaac Bythewood
 Iván Raskovsky
 Jaap Roes
 James Roe
@@ -45,6 +52,7 @@ Jervis Whitley
 John-Scott Atlakson
 Jonas von Poser
 Jonathan Lukens
+Julian Scheid
 Julien Phalip
 Justin Lilly
 Luis Nell
@@ -53,7 +61,9 @@ Lukasz Balcerzak
 Maciek Szczesniak
 Maor Ben-Dayan
 Mark Lavin
+Marsel Mavletkulov
 Matt Schick
+Matthew Tretter
 Mehmet S. Catalbas
 Michael van de Waeter
 Mike Yumatov
@@ -65,14 +75,18 @@ Peter Bengtsson
 Peter Lundberg
 Philipp Bosch
 Philipp Wollermann
+Rich Leland
 Sam Dornan
+Saul Shanabrook
 Selwin Ong
 Shabda Raaj
 Stefano Brentegani
 Sébastien Piquemal
 Thom Linton
+Thomas Schreiber
 Tino de Bruijn
 Ulrich Petri
+Ulysses V
 Vladislav Poluhin
 wesleyb
 Wilson Júnior

LICENSE

@@ -1,6 +1,6 @@
 django_compressor
 -----------------
-Copyright (c) 2009-2012 Django Compressor authors (see AUTHORS file)
+Copyright (c) 2009-2013 Django Compressor authors (see AUTHORS file)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -1,6 +1,7 @@
 include AUTHORS
 include README.rst
 include LICENSE
+recursive-include docs *
 recursive-include compressor/templates/compressor *.html
 recursive-include compressor/tests/media *.js *.css *.png *.coffee
 recursive-include compressor/tests/test_templates *.html

README.rst

@@ -48,7 +48,7 @@ tool it will be fairly easy to implement a custom filter. Simply extend
 from one of the available base classes.
 
 More documentation about the usage and settings of Django Compressor can be
-found on `django_compressor.readthedocs.org`_.
+found on `django-compressor.readthedocs.org`_.
 
 The source code for Django Compressor can be found and contributed to on
 `github.com/jezdez/django_compressor`_. There you can also file tickets.
@@ -65,7 +65,7 @@ The `in-development version`_ of Django Compressor can be installed with
 .. _JSMin: http://www.crockford.com/javascript/jsmin.html
 .. _cssmin: https://github.com/zacharyvoase/cssmin
 .. _data URIs: http://en.wikipedia.org/wiki/Data_URI_scheme
-.. _django_compressor.readthedocs.org: http://django_compressor.readthedocs.org/
+.. _django-compressor.readthedocs.org: http://django-compressor.readthedocs.org/en/latest/
 .. _github.com/jezdez/django_compressor: https://github.com/jezdez/django_compressor
 .. _in-development version: http://github.com/jezdez/django_compressor/tarball/develop#egg=django_compressor-dev
 

compressor/__init__.py

@@ -1,2 +1,2 @@
 # following PEP 386
-__version__ = "1.2"
+__version__ = "1.3"

docs/changelog.txt

@@ -346,7 +346,7 @@ Major improvements and a lot of bugfixes, some of which are:
 - Added ``mtime_cache`` management command to add and/or remove all mtimes
   from the cache.
 
-- Moved docs to Read The Docs: http://django_compressor.readthedocs.org
+- Moved docs to Read The Docs: http://django-compressor.readthedocs.org/en/latest/
 
 - Added optional ``compressor.storage.GzipCompressorFileStorage`` storage
   backend that gzips of the saved files automatically for easier deployment.

docs/conf.py

@@ -42,7 +42,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Django Compressor'
-copyright = u'2012, Django Compressor authors'
+copyright = u'2013, Django Compressor authors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

setup.py

@@ -109,7 +109,7 @@ def find_package_data(where='.', package='',
 setup(
     name="django_compressor",
     version=find_version("compressor", "__init__.py"),
-    url='http://django_compressor.readthedocs.org/',
+    url='http://django-compressor.readthedocs.org/en/latest/',
     license='MIT',
     description="Compresses linked and inline JavaScript or CSS into single cached files.",
     long_description=read('README.rst'),