Skip to content

Commit

Permalink
Merge pull request #627 from jordi12100/master
Browse files Browse the repository at this point in the history
Use right path to repository
  • Loading branch information
masom committed Dec 11, 2015
2 parents 0b0c09e + f76a266 commit 16412e7
Show file tree
Hide file tree
Showing 18 changed files with 146 additions and 146 deletions.
26 changes: 13 additions & 13 deletions CHANGELOG
Expand Up @@ -327,7 +327,7 @@ When upgrading, make sure to include this filter in your `FILTERS` configuration
Release 4.3.0 (4.3.0)
* Fixes #141 - Add rotation support (thanks @guilhermebruzzi and @nopiece).

[Diff to previous release](https://github.com/globocom/thumbor/compare/4.2.1...4.3.0)
[Diff to previous release](https://github.com/thumbor/thumbor/compare/4.2.1...4.3.0)
[pypi release](https://pypi.python.org/pypi/thumbor/4.3.0)

Release 4.2.1 (4.2.1)
Expand All @@ -338,7 +338,7 @@ Release 4.2.1 (4.2.1)

If you've upgraded to the 4.2.0 release it's VERY, VERY recommended that you upgrade to 4.2.1 as soon as possible.

[Diff to previous release](https://github.com/globocom/thumbor/compare/4.2.0...4.2.1)
[Diff to previous release](https://github.com/thumbor/thumbor/compare/4.2.0...4.2.1)
[pypi release](https://pypi.python.org/pypi/thumbor/4.2.1)

Release 4.2.0 (4.2.0)
Expand All @@ -359,7 +359,7 @@ With the use of gifsicle engine, no filters will work for the gif images (all th

This release has a bug that was fixed in 4.2.1. If you are using 4.2.0, please upgrade as soon as posssible.

[Diff to previous release](https://github.com/globocom/thumbor/compare/4.1.3...4.2.0)
[Diff to previous release](https://github.com/thumbor/thumbor/compare/4.1.3...4.2.0)
[pypi release](https://pypi.python.org/pypi/thumbor/4.2.0)

Release 4.1.3 (4.1.3)
Expand All @@ -369,34 +369,34 @@ If your current release is greater than 4.0.0, be advised you must upgrade as so

* Fixes #305 - This is a **critical** bug. Images will be served with Exif data, meaning they can potentially be many times heavier than they should be.

[Diff to previous release](https://github.com/globocom/thumbor/compare/4.1.2...4.1.3)
[Diff to previous release](https://github.com/thumbor/thumbor/compare/4.1.2...4.1.3)
[pypi release](https://pypi.python.org/pypi/thumbor/4.1.3)

Release 4.1.2 (4.1.2)
* Improved support for file descriptors. Now the --fd argument supports both the number of the file descriptor or the path in the file system. Fixes #300.

[Diff to previous release](https://github.com/globocom/thumbor/compare/4.1.1...4.1.2)
[Diff to previous release](https://github.com/thumbor/thumbor/compare/4.1.1...4.1.2)
[pypi release](https://pypi.python.org/pypi/thumbor/4.1.2)

Release 4.1.1 (4.1.1)
* Thumbor does not convert CMYK unless needed now;
* New merge option in the composite filter infrastructure.

[Diff to previous release](https://github.com/globocom/thumbor/compare/4.1.0...4.1.1)
[Diff to previous release](https://github.com/thumbor/thumbor/compare/4.1.0...4.1.1)
[pypi release](https://pypi.python.org/pypi/thumbor/4.1.1)

Release 4.1.0 (4.1.0)
* New filter: [Extract Focal Points](https://github.com/thumbor/thumbor/wiki/Extract-Focal-Points)
* Infrastructure for filters on different phases during the image processing lifecycle. Right now PHASE_POST_TRANSFORM and PHASE_PRE_LOAD are supported. All existing filters default to PHASE_POST_TRANSFORM

[Diff to previous release](https://github.com/globocom/thumbor/compare/4.0.4...4.1.0)
[Diff to previous release](https://github.com/thumbor/thumbor/compare/4.0.4...4.1.0)
[pypi release](https://pypi.python.org/pypi/thumbor/4.1.0)

Release 4.0.4 (4.0.4)
* Fixed issue with blur filter when used with more than 150 of radius (by @heynemann);
* Fixed issue with format filter when used in conjunction with auto_webp (by @cezarsa).

[Diff to previous release](https://github.com/globocom/thumbor/compare/4.0.3...4.0.4)
[Diff to previous release](https://github.com/thumbor/thumbor/compare/4.0.3...4.0.4)
[pypi release](https://pypi.python.org/pypi/thumbor/4.0.4)

Release 4.0.3 (4.0.3)
Expand Down Expand Up @@ -472,16 +472,16 @@ Release 3.14.0 (3.14.0)
This is an unstable release.

Release 3.13.3 (3.13.3)
* Fixed [#193](https://github.com/globocom/thumbor/issues/193). File storage now uses atomic storage of files, thus avoiding corruption of stored images.
* Fixed [#193](https://github.com/thumbor/thumbor/issues/193). File storage now uses atomic storage of files, thus avoiding corruption of stored images.

Release 3.13.2 (3.13.2)
* Merged [#202](https://github.com/globocom/thumbor/pull/202). Proxy support added to default HTTP Loader.
* Merged [#202](https://github.com/thumbor/thumbor/pull/202). Proxy support added to default HTTP Loader.

Release 3.13.1 (3.13.1)
* Merged [#197](https://github.com/globocom/thumbor/pull/197). Healthcheck now replied to HEAD requests.
* Merged [#197](https://github.com/thumbor/thumbor/pull/197). Healthcheck now replied to HEAD requests.

Release 3.13.0 (3.13.0)
* Fixes [#204](https://github.com/globocom/thumbor/issues/204). Thumbor now allows users to specify that WebP should be automatically used whenever the request has the proper Accept header (image/webp).
* Fixes [#204](https://github.com/thumbor/thumbor/issues/204). Thumbor now allows users to specify that WebP should be automatically used whenever the request has the proper Accept header (image/webp).

Release 3.12.2 (3.12.2)
Added some extra logging in the finish request stage.
Expand All @@ -496,5 +496,5 @@ Release 3.11.1 (3.11.1)

Release 3.12.0 (3.12.0)
* Fixed an issue with animated gifs (sigh);
* Add detection support for WEBP format. Merge pull request [#194](https://github.com/globocom/thumbor/pull/194) from dhardy92:feature_Add_WEBP_Detection;
* Add detection support for WEBP format. Merge pull request [#194](https://github.com/thumbor/thumbor/pull/194) from dhardy92:feature_Add_WEBP_Detection;
* Support for the new release of Pillow (2.1.0) and works with Pillow master branch for now.
2 changes: 1 addition & 1 deletion README.mkd
Expand Up @@ -29,7 +29,7 @@ That URL would show an image of the big brother brasil participants in 300x200 u
There are several other options to the image URL configuration. You can check them in the Usage page.

For more information check [thumbor's
documentation](https://github.com/globocom/thumbor/wiki "thumbor docs").
documentation](https://github.com/thumbor/thumbor/wiki "thumbor docs").

### Demo

Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Expand Up @@ -19,7 +19,7 @@ thumbor (3.6.11) unstable; urgency=low
* Merge pull request #143 from nhuray/master
* Disable REST Upload by default
* Merge pull request #142 from morpheu/master
* Merge branch 'master' of https://github.com/globocom/thumbor
* Merge branch 'master' of https://github.com/thumbor/thumbor
* Adding python-dev as build-dependency
* Other detector options in thumbor.conf

Expand Down
6 changes: 3 additions & 3 deletions debian/control
Expand Up @@ -5,9 +5,9 @@ Priority: optional
Standards-Version: 3.9.3
Build-Depends: python (>=2.6.6-3~), debhelper, python-setuptools, python-dev (>=2.6.6-3~)
X-Python-Version: current
Homepage: https://github.com/globocom/thumbor/wiki
Vcs-Git: git://github.com/globocom/thumbor.git
Vcs-Browser: https://github.com/globocom/thumbor
Homepage: https://github.com/thumbor/thumbor/wiki
Vcs-Git: git://github.com/thumbor/thumbor.git
Vcs-Browser: https://github.com/thumbor/thumbor

Package: thumbor
Architecture: any
Expand Down
4 changes: 2 additions & 2 deletions debian/thumbor.conf
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-

# thumbor imaging service
# https://github.com/globocom/thumbor/wiki
# https://github.com/thumbor/thumbor/wiki

# Licensed under the MIT license:
# http://www.opensource.org/licenses/mit-license
Expand Down Expand Up @@ -108,7 +108,7 @@ ENGINE = 'thumbor.engines.pil'

# detectors to use to find Focal Points in the image
# more about detectors can be found in thumbor's docs
# at https://github.com/globocom/thumbor/wiki
# at https://github.com/thumbor/thumbor/wiki
DETECTORS = [
#'thumbor.detectors.face_detector',
#'thumbor.detectors.profile_detector',
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration.rst
Expand Up @@ -88,7 +88,7 @@ Thumbor ships with three imaging engines:
</del>

(This engine isn't supported anymore, check
`#52 <https://github.com/globocom/thumbor/issues/52>`__)
`#52 <https://github.com/thumbor/thumbor/issues/52>`__)

RESULT\_STORAGE
~~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion docs/custom_detection.rst
Expand Up @@ -12,7 +12,7 @@ will be able to use it. Just add its full name to the detectors
Creating a Custom Detector
--------------------------

As you can see here `<https://github.com/globocom/thumbor/blob/master/thumbor/detectors/face_detector/__init__.py>`_
As you can see here `<https://github.com/thumbor/thumbor/blob/master/thumbor/detectors/face_detector/__init__.py>`_
it is pretty easy to implement your own custom detector.

All you have to do is create a class that inherits from BaseDetector and
Expand Down
8 changes: 4 additions & 4 deletions docs/filling.rst
Expand Up @@ -27,22 +27,22 @@ As original image is:
.. image:: images/tom_before_brightness.jpg
:alt: Original picture

`<http://localhost:8888/unsafe/fit-in/300x300/filters:fill(blue)/https://github.com/globocom/thumbor/wiki/tom_before_brightness.jpg>`_
`<http://localhost:8888/unsafe/fit-in/300x300/filters:fill(blue)/https://github.com/thumbor/thumbor/wiki/tom_before_brightness.jpg>`_

.. image:: images/tom_fill_blue.jpg
:alt: Picture after the fill(blue) filter

`<http://localhost:8888/unsafe/fit-in/300x300/filters:fill(f00)/https://github.com/globocom/thumbor/wiki/tom_before_brightness.jpg>`_
`<http://localhost:8888/unsafe/fit-in/300x300/filters:fill(f00)/https://github.com/thumbor/thumbor/wiki/tom_before_brightness.jpg>`_

.. image:: images/tom_fill_red.jpg
:alt: Picture after the fill(f00) filter

`<http://localhost:8888/unsafe/fit-in/300x300/filters:fill(add8e6)/https://github.com/globocom/thumbor/wiki/tom_before_brightness.jpg>`_
`<http://localhost:8888/unsafe/fit-in/300x300/filters:fill(add8e6)/https://github.com/thumbor/thumbor/wiki/tom_before_brightness.jpg>`_

.. image:: images/tom_fill_lightblue.jpg
:alt: Picture after the fill(add8e6)

`<http://localhost:8888/unsafe/fit-in/300x300/filters:fill(auto)/https://github.com/globocom/thumbor/wiki/tom_before_brightness.jpg>`_
`<http://localhost:8888/unsafe/fit-in/300x300/filters:fill(auto)/https://github.com/thumbor/thumbor/wiki/tom_before_brightness.jpg>`_

.. image:: images/tom_fill_auto.jpg
:alt: Picture after the fill(auto) filter (since 3.7.1)
4 changes: 2 additions & 2 deletions docs/image_loader.rst
Expand Up @@ -64,15 +64,15 @@ image loader.

The structure of the module you should implement can be seen in the http
loader at
`<https://github.com/globocom/thumbor/blob/master/thumbor/loaders/http_loader.py>`_.
`<https://github.com/thumbor/thumbor/blob/master/thumbor/loaders/http_loader.py>`_.

The only required method to implement is the one that receives the
portion of the URI that has the original image path, named **load**.
This method also receives a callback and should call the callback with
the results of reading the image.

Another example can be seen in the filesystem loader at
`<https://github.com/globocom/thumbor/blob/master/thumbor/loaders/file_loader.py>`_.
`<https://github.com/thumbor/thumbor/blob/master/thumbor/loaders/file_loader.py>`_.

You can optionally implement a validate(URI) method that thumbor will
call to make sure that your loader can accept the user required URI.
2 changes: 1 addition & 1 deletion docs/image_storage.rst
Expand Up @@ -128,4 +128,4 @@ configuration.

All you have to do is create a class called Storage that inherits from
BaseStorage in your module, as can be seen in
`<https://github.com/globocom/thumbor/blob/master/thumbor/storages/file_storage.py>`_.
`<https://github.com/thumbor/thumbor/blob/master/thumbor/storages/file_storage.py>`_.
4 changes: 2 additions & 2 deletions docs/installing.rst
Expand Up @@ -89,13 +89,13 @@ From the latest version of the source

Clone thumbor's repository and install it using one of the following:

``pip install git+git://github.com/globocom/thumbor.git``
``pip install git+git://github.com/thumbor/thumbor.git``

or

.. code:: bash
git clone git://github.com/globocom/thumbor.git
git clone git://github.com/thumbor/thumbor.git
cd thumbor
Expand Down
6 changes: 3 additions & 3 deletions docs/plugins.rst
Expand Up @@ -13,7 +13,7 @@ Storages
`thumbor\_hbase <https://github.com/dhardy92/thumbor_hbase>`__ (by `Damien Hardy <https://github.com/dhardy92>`__)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

`Thumbor <https://github.com/globocom/thumbor/wiki>`__ is a smart
`Thumbor <https://github.com/thumbor/thumbor/wiki>`__ is a smart
imaging service. It enables on-demand crop, resizing and flipping of
images.

Expand Down Expand Up @@ -52,7 +52,7 @@ your thumbor.conf to read:
`thumbor\_mongodb <https://github.com/dhardy92/thumbor_mongodb>`__ (by `Damien Hardy <https://github.com/dhardy92>`__)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

`Thumbor <https://github.com/globocom/thumbor/wiki>`__ is a smart
`Thumbor <https://github.com/thumbor/thumbor/wiki>`__ is a smart
imaging service. It enables on-demand crop, resizing and flipping of
images.

Expand Down Expand Up @@ -112,7 +112,7 @@ Using it is simple, just change your configuration in thumbor.conf:
::

# Use rackspace for result storage.
# For more info on result storage: https://github.com/globocom/thumbor/wiki/Result-storage
# For more info on result storage: https://github.com/thumbor/thumbor/wiki/Result-storage
RESULT_STORAGE = 'thumbor_rackspace.result_storages.cloudfile_storage'

# Pyrax Rackspace configuration file location
Expand Down

0 comments on commit 16412e7

Please sign in to comment.