Skip to content

Commit

Permalink
Merged release/0.1.0 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
todstoychev committed Feb 22, 2016
2 parents 09bac5a + 475197c commit 15992f0
Show file tree
Hide file tree
Showing 61 changed files with 2,449 additions and 3,491 deletions.
13 changes: 3 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
### Composer template
composer.phar
vendor/
.idea/

# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock

# Created by .ignore support plugin (hsz.mobi)
/vendor/
/.idea/
/testdocs/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ php:
matrix:
fast_finish: true
allow_failures:
- php: 7.0
- php: hhvm
- php: nightly

# faster builds on new travis setup not using sudo
sudo: false
Expand Down
26 changes: 9 additions & 17 deletions composer.json
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
{
"name": "todstoychev/icr",
"type": "library",
"description": "Image crop resizer based on Imagine module",
"keywords": [
"image",
"resizer",
"imagine",
"crop",
"scale",
"image manipulation"
],
"description": "Image manipulation and upload module",
"homepage": "https://github.com/todstoychev/icr",
"license": "MIT",
"authors": [
Expand All @@ -18,16 +9,17 @@
"email": "[email protected]"
}
],
"support": {
"email": "[email protected]"
},
"require": {
"php": ">=5.4",
"laravel/framework": "5.*",
"imagine/imagine": "~0.5.0"
"php": ">=5.5.9",
"imagine/imagine": "0.6.*",
"illuminate/support": ">5.1",
"illuminate/filesystem": ">5.1",
"league/flysystem": ">1.0",
"nikic/php-parser": "^2.0",
"vlucas/phpdotenv": "^2.2"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"phpunit/phpunit": "~4.8"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 15992f0

Please sign in to comment.