Skip to content

Commit

Permalink
Merge branch 'master' of github.com:froala/wysiwyg-cake
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanneculai committed Jul 21, 2017
2 parents 62c79fb + de66ecd commit 5a96072
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# Froala WYSIWYG Editor Plugin for CakePHP 3

[![Packagist](https://img.shields.io/packagist/v/froala/wysiwyg-cake.svg)](https://packagist.org/packages/froala/wysiwyg-cake)
[![Packagist](https://img.shields.io/packagist/dt/froala/wysiwyg-cake.svg)](https://packagist.org/packages/froala/wysiwyg-cake)

> CakePHP Plugin for Froala Javascript WYSIWYG Text Editor. For CakePHP >=3.0.
> See [froala/wysiwyg-cake](https://github.com/froala/wysiwyg-cake) for CakePHP version 2.
> See [froala/wysiwyg-cake2](https://github.com/froala/wysiwyg-cake2) for CakePHP version 2.
## About
The purpose of placing [Froala WYSIWYG Editor](https://www.froala.com/wysiwyg-editor) in a plugin is to keep it separate from a themed view, the regular webroot or the app in general, which makes it easier to update and overall follows the idea of keeping the code clean and modular.
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
],
"homepage": "https://www.froala.com/wysiwyg-editor",
"license": [
"One Website",
"Advanced",
"Hobby",
"Professional",
"OEM"
],
"authors": [
Expand All @@ -32,7 +32,7 @@
"require": {
"php": ">=5.5.9",
"cakephp/cakephp": ">=3.3.2 <4.0.0",
"fontawsome/font-awesome": ">=4.4.0"
"fortawesome/font-awesome": ">=4.4.0"
},
"require-dev": {
"phpunit/phpunit": "*"
Expand Down

0 comments on commit 5a96072

Please sign in to comment.