Skip to content

Commit

Permalink
Release 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
josegonzalez committed Sep 22, 2015
1 parent e8df835 commit 4b0f60a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 27 deletions.
5 changes: 0 additions & 5 deletions .semver

This file was deleted.

4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
# built documents.
#
# The short X.Y version.
version = '1.1.1'
version = '1.3.0'
# The full version, including alpha/beta/rc tags.
release = '1.1.1'
release = '1.3.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
40 changes: 20 additions & 20 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Using `Composer <http://getcomposer.org/>`__
`View on
Packagist <https://packagist.org/packages/josegonzalez/cakephp-upload>`__,
and copy the json snippet for the latest version into your project's
``composer.json``. Eg, v. 1.1.1 would look like this:
``composer.json``. Eg, v. 1.3.0 would look like this:

.. code:: json
{
"require": {
"josegonzalez/cakephp-upload": "1.1.1"
}
}
{
"require": {
"josegonzalez/cakephp-upload": "1.3.0"
}
}
This plugin has the type ``cakephp-plugin`` set in its own
``composer.json``, composer knows to install it inside your ``/Plugins``
Expand All @@ -39,9 +39,9 @@ In your *app directory* type:

.. code:: bash
git submodule add -b master git://github.com/josegonzalez/cakephp-upload.git Plugin/Upload
git submodule init
git submodule update
git submodule add -b master git://github.com/josegonzalez/cakephp-upload.git Plugin/Upload
git submodule init
git submodule update
GIT Clone
~~~~~~~~~
Expand All @@ -50,7 +50,7 @@ In your ``Plugin`` directory type:

.. code:: bash
git clone -b master git://github.com/josegonzalez/cakephp-upload.git Upload
git clone -b master git://github.com/josegonzalez/cakephp-upload.git Upload
Imagick Support
---------------
Expand All @@ -60,16 +60,16 @@ have Imagick installed:

.. code:: bash
# Debian systems
sudo apt-get install php-imagick
# Debian systems
sudo apt-get install php-imagick
# OS X Homebrew
brew tap homebrew/dupes
brew tap josegonzalez/homebrew-php
brew install php54-imagick
# OS X Homebrew
brew tap homebrew/dupes
brew tap josegonzalez/homebrew-php
brew install php54-imagick
# From pecl
pecl install imagick
# From pecl
pecl install imagick
If you cannot install Imagick, instead configure the plugin with
``'thumbnailMethod' => 'php'`` in the files options.
Expand All @@ -81,8 +81,8 @@ You need to enable the plugin your ``app/Config/bootstrap.php`` file:

.. code:: php
<?php
CakePlugin::load('Upload');
<?php
CakePlugin::load('Upload');
If you are already using ``CakePlugin::loadAll();``, then this is not
necessary.

0 comments on commit 4b0f60a

Please sign in to comment.