Skip to content

Commit

Permalink
Merge pull request #9 from iiDestiny/update-5.5
Browse files Browse the repository at this point in the history
5.5 support
  • Loading branch information
summerblue committed Oct 25, 2017
2 parents cb4410a + 8c7c8bc commit 173b3ba
Show file tree
Hide file tree
Showing 1,804 changed files with 25,696 additions and 12,435 deletions.
4 changes: 4 additions & 0 deletions .gitignore
@@ -0,0 +1,4 @@
vendor
.idea
.DS_Store
composer.lock
16 changes: 12 additions & 4 deletions composer.json
Expand Up @@ -14,12 +14,13 @@
"issues": "https://github.com/summerblue/administrator/issues"
},
"require": {
"php": ">=5.4.0",
"laravel/framework": "5.*",
"php": ">=7.0.0",
"laravel/framework": "5.5.*",
"ckeditor/ckeditor": "4.*"
},
"require-dev": {
"mockery/mockery": "~0.9"
"mockery/mockery": "~0.9",
"phpunit/phpunit": "~5.7.12"
},
"autoload": {
"classmap": [
Expand All @@ -36,5 +37,12 @@
"if [ -d \"vendor/ckeditor/\" ] \nthen \nrm -R vendor/ckeditor/ \nfi"
]
},
"minimum-stability": "dev"
"minimum-stability": "dev",
"extra": {
"laravel": {
"providers": [
"Frozennode\\Administrator\\AdministratorServiceProvider"
]
}
}
}
1 change: 1 addition & 0 deletions public/js/ckeditor/.github/ISSUE_TEMPLATE
@@ -0,0 +1 @@
Please do not report issues in CKEditor. The correct location of CKEditor issue tracker is: http://dev.ckeditor.com/
1,800 changes: 1,358 additions & 442 deletions public/js/ckeditor/CHANGES.md

Large diffs are not rendered by default.

2,684 changes: 1,420 additions & 1,264 deletions public/js/ckeditor/LICENSE.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/js/ckeditor/README.md
Expand Up @@ -36,7 +36,7 @@ If you are using git for your project and you want to integrate CKEditor, we rec

### Using Package Managers

See the [Installing CKEditor with Package Managers](http://docs.ckeditor.com/#!/guide/dev_package_managers) article for more details about installing CKEditor with Bower and Composer.
See the [Installing CKEditor with Package Managers](http://docs.ckeditor.com/#!/guide/dev_package_managers) article for more details about installing CKEditor with [Bower](http://bower.io/), [Composer](https://getcomposer.org/) and [npm](https://www.npmjs.com/).

## Repository Structure

Expand Down Expand Up @@ -65,7 +65,7 @@ For example: `4.0/basic`, `4.0.1/standard`. This convention was changed in CKEdi

## Checking Your Installation

The editor comes with a few sample pages that can be used to verify if the installation succeeded. Take a look at the `samples` directory.
The editor comes with a sample page that can be used to verify if the installation succeeded. Take a look at the `samples` directory.

To test your installation, just call the following page for your website:

Expand Down
14 changes: 7 additions & 7 deletions public/js/ckeditor/adapters/jquery.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions public/js/ckeditor/bower.json
Expand Up @@ -2,7 +2,9 @@
"name": "ckeditor",
"description": "JavaScript WYSIWYG web text editor.",
"keywords": [ "ckeditor", "fckeditor", "editor", "wysiwyg", "html", "richtext", "text", "javascript" ],
"authors": "CKSource - Frederico Knabben (http://ckeditor.com)",
"license": "http://ckeditor.com/about/license",
"homepage": "http://ckeditor.com"
}
"authors": "CKSource (http://cksource.com/)",
"license": "For licensing, see LICENSE.md or http://ckeditor.com/license.",
"homepage": "http://ckeditor.com",
"main": "./ckeditor.js",
"moduleType": "globals"
}

0 comments on commit 173b3ba

Please sign in to comment.