Skip to content
This repository has been archived by the owner on Sep 19, 2019. It is now read-only.

Commit

Permalink
Merge pull request #8 from Neoflow/dev
Browse files Browse the repository at this point in the history
1.2.1 release-merge
  • Loading branch information
Jonathan Nessier authored Sep 13, 2018
2 parents c456bcc + 0015e1b commit a194260
Show file tree
Hide file tree
Showing 11 changed files with 1,972 additions and 1,964 deletions.
2 changes: 0 additions & 2 deletions dev/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@
// Alternative to images_upload_handler callback, but not supported by Filery
//images_upload_url: 'http://filery.local/api/index.php?images_upload_url=1',


filery_api_token: '<?= $token->toString(); ?>',
filery_api_url: 'http://filery.local/api/index.php',
filery_show_images: false,

file_picker_callback: function (callback, value, meta) {
Filery.filePickerCallback(callback, value, meta);
Expand Down
18 changes: 14 additions & 4 deletions dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Feel free to try the [demo](https://demos.neoflow.ch/filery/) online.

**Table of Contents**
* [Requirements](#requirements)
* [Download](#download)
* [Installation](#installation)
+ [1. TinyMCE plugin](#1-tinymce-plugin)
- [Installation](#installation-1)
Expand All @@ -16,6 +17,7 @@ Feel free to try the [demo](https://demos.neoflow.ch/filery/) online.
- [Installation](#installation-2)
- [Configuration](#configuration-2)
- [Advanced configuration](#advanced-configuration-2)
* [Support](#support)
* [Donation](#donation)
* [License](#license)

Expand All @@ -27,13 +29,17 @@ Feel free to try the [demo](https://demos.neoflow.ch/filery/) online.

Please use the modern theme of TinyMCE for the best user experience with Filery.

# Download
You can download the latest release [here](https://github.com/Neoflow/Filery/releases).

Older versions of Filery than the latest release aren't support and recommended use.

# Installation
The installation is done in two steps:
1. [Installation of the TinyMCE plugin](#1-tinymce-plugin)
2. [Installation of the plugin API](#2-plugin-api)
Filery and the installation is divided into two parts:
1. [TinyMCE Plugin](#1-tinymce-plugin)
2. [Plugin API](#2-plugin-api)

But first you have to download and unzip the [latest release](https://github.com/rjgamer/Filery/releases/latest).
Both parts must be installed and configured as described below. Otherwise Filery will not run.

## 1. TinyMCE plugin
### Installation
Expand Down Expand Up @@ -77,6 +83,7 @@ tinymce.init({
filery_api_url: 'http://domain.tld/filery/api/index.php',
filery_api_token: '<?= $token->toString(); ?>',
filery_dialog_height: '400px',
filery_show_images: true
// ...
});
```
Expand Down Expand Up @@ -128,6 +135,9 @@ return [
### Advanced configuration
There are more advanced configuration parameters for the API. If you really want to change it, then please take a look at the [AbstractAPI](https://github.com/rjgamer/Filery/blob/master/api/classes/Filery/AbstractAPI.php#L15) class on line 15.

# Support
Older versions of Filery than the latest release aren't supported and recommended use.

# Donation
If you like my work or if you use it for a commercial project, please give me a donation. Thanks!

Expand Down
Loading

0 comments on commit a194260

Please sign in to comment.