From 890f6039016d354f5d93f047c0c25be60103e886 Mon Sep 17 00:00:00 2001 From: Al Ganiev Date: Mon, 7 Dec 2015 00:10:07 +1000 Subject: [PATCH 1/7] updated readme, before tagging --- README.md | 75 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 99504be..a48a0ea 100644 --- a/README.md +++ b/README.md @@ -3,29 +3,29 @@ FMElfinderBundle [ElFinder](https://github.com/Studio-42/elFinder) integration in Symfony2 -### Gitter chat ### - -[![Join the chat at https://gitter.im/helios-ag/FMElfinderBundle](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/helios-ag/FMElfinderBundle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - ### Code Quality Assurance ### -| SensioLabs Insight | Travis CI | CoverAlls| -| ------------------------|-------------|-----------------| -|[![SensioLabsInsight](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17/mini.png)](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17)|[![Build Status](https://secure.travis-ci.org/helios-ag/FMElfinderBundle.png)](http://travis-ci.org/helios-ag/FMElfinderBundle)|[![Coverage Status](https://coveralls.io/repos/helios-ag/FMElfinderBundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/helios-ag/FMElfinderBundle?branch=master) +| Gitter | SL Insight | Travis CI | CoverAlls| License | +|----------------| ------------------------|-------------|-----------------|-----------------| +|[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=flat-square)](https://gitter.im/helios-ag/FMElfinderBundle)|[![SensioLabsInsight](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17/mini.png)](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17) +|[![Build Status](https://secure.travis-ci.org/helios-ag/FMElfinderBundle.png)](http://travis-ci.org/helios-ag/FMElfinderBundle) +|[![Coverage Status](https://coveralls.io/repos/helios-ag/FMElfinderBundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/helios-ag/FMElfinderBundle?branch=master) +[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE) [![Dependency Status](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4) -[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/stable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![Total Downloads](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/downloads.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![Latest Unstable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/unstable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![License](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/license.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) -[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/helios-ag/fmelfinderbundle/trend.png)](https://bitdeli.com/free "Bitdeli Badge") +[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/stable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![Total Downloads](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/downloads.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![Latest Unstable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/unstable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) + **elFinder** is an open-source file manager for web, written in JavaScript using jQuery UI. Creation is inspired by simplicity and convenience of Finder program used in Mac OS X operating system. Recommended bundles to use with: - -* [TinymceBundle](https://github.com/stfalcon/TinymceBundle/) -* [IvoryCKEditorBundle](https://github.com/egeloen/IvoryCKEditorBundle/) -* [TrsteelCkeditorBundle](https://github.com/trsteel88/TrsteelCkeditorBundle/) -* [FMSummernoteBundle](https://github.com/helios-ag/summernote-bundle/) +| FMTinyMCEBundle | FMSummernoteBundle | IvoryCKEditorBundle| TrsteelCkeditorBundle | +| ------------------------|-------------|-----------------|-----------------| +|[![FMTinyMCEBundle](https://img.shields.io/badge/FMTinyMCEBundle-download-brightgreen.svg)](https://github.com/helios-ag/FMTinyMCEBundle)| +[![IvoryCKEditorBundle](https://img.shields.io/badge/IvoryCKEditorBundle-download-orange.svg)](https://github.com/egeloen/IvoryCKEditorBundle)| +[![TrsteelCkeditorBundle](https://img.shields.io/badge/TrsteelCkeditorBundle-download-blue.svg)](https://github.com/trsteel88/TrsteelCkeditorBundle)| +[![FMSummernoteBundle](https://img.shields.io/badge/FMSummernoteBundle-download-brightgreen.svg)](https://github.com/helios-ag/summernote-bundle)| **Table of contents** @@ -61,12 +61,20 @@ Recommended bundles to use with: ## Installation -To install this bundle, you'll need both the lib [ElFinderPHP](https://github.com/helios-ag/ElFinderPHP) -and this bundle. +### Step 1: Installation + +**Version 6 (Symfony 3 Compatible):** -This instruction explain how to setup bundle on Symfony 2.1 and newer +Add FMElFinderBundle to your composer.json + +```json +{ + "require": { + "helios-ag/fm-elfinder-bundle": "~6", + } +} +``` -### Step 1: Installation **Version 5:** @@ -92,13 +100,13 @@ also add component-dir under config node of composer.json **Version 4:** -This version dont use **component** library +This version doesn't use **component** library ```sh composer require helios-ag/fm-elfinder-bundle: "~4.0" ``` -For Symfony between 2.1 and 2.3 (2.3 included) use version ~2.3 +For Symfony =<2.3 use version ~2.3 ```sh @@ -112,12 +120,6 @@ Now tell composer to download the bundle by running the command: composer update helios-ag/fm-elfinder-bundle ``` -Install legacy version of the bundle ([documentation](https://github.com/helios-ag/FMElfinderBundle/blob/1.0/README.md)): - -```sh -composer require helios-ag/fm-elfinder-bundle: "~1.5" -``` - ### Step 2: Enable the bundle Enable the bundle in the kernel: @@ -174,21 +176,24 @@ fm_elfinder: instances: default: locale: %locale% # defaults to current request locale - editor: ckeditor # other options are tinymce, tinymce4, form, custom and simple - fullscreen: true # defaults true, applies to simple and ckeditor editors - theme: smoothness # jquery theme + editor: ckeditor # other options are tinymce, tinymce4, fm_tinymce, form, simple, custom + #editor_template: set custom template for your editor # default null + #path_prefix: / # for setting custom assets path prefix, useful for non vhost configurations, i.e. http://127.0.0.1/mysite/ + #fullscreen: true|false # defaults true, applies to simple and ckeditor editors + #theme: smoothness # jquery theme, default is 'smoothness' include_assets: true # disable if you want to handle loading of the javascript and css assets yourself connector: - debug: false # defaults to false + #debug: true|false # defaults to false roots: # at least one root must be defined uploads: - show_hidden: false # defaults to false + #show_hidden: true|false # defaults to false, hide files that driver: LocalFileSystem path: uploads upload_allow: ['image/png', 'image/jpg', 'image/jpeg'] upload_deny: ['all'] upload_max_size: 2M - + #attributes: example of setting attributes permission + # - { pattern: '/(.*?)/', read: true, write: false, locked: true } ``` * default - instance of elfinder, can be used to define multiple configurations of ElFinder, allows simultaneous configuration for different types of WYSIWYG editors in your project @@ -198,7 +203,7 @@ fm_elfinder: * locale - locale determines, which language, ElFinder will use, to translate user interface, default is current request locale * cors_support - allows cross domain responses handling (default false) * editor - determines what template to render, to be compatible with WYSIWYG web editor, currently supported options are: - "ckeditor", "tinymce" for tinymce3, "tinymce4" for tinymce4, "form" for form type, "simple" for standalone and "custom". + "ckeditor" (to use with IvoryCKEditorBundle or TrsteelCkeditorBundle), "fm_tinymce" for tinymce4 (to use with FMTinyMCEBundle), "form" for form type, "simple" for standalone and "custom" for custom template. How to configure CKEDitor and TinyMCE to work with this bundle, will be explained further in this document. * editor_template - define template to render editor is set to "custom". * connector - root node for defining options for elfinder root directories. @@ -214,9 +219,7 @@ fm_elfinder: * upload_max_size: 2M You can see the full list of roots options [here](https://github.com/Studio-42/elFinder/wiki/Connector-configuration-options#root-options "connector options list"). To use them, -convert camelCased option name to under_scored option name. - -**Note:** `crypt_lib` option is not available as not implemented yet by elFinder PHP library. +convert camelCased option name to under_scored name. ### Use multiple upload folder by instance From ecc79d1601cdc8423d474c6dd8c18130ea9500ea Mon Sep 17 00:00:00 2001 From: Al Ganiev Date: Mon, 7 Dec 2015 00:16:14 +1000 Subject: [PATCH 2/7] misprints --- README.md | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a48a0ea..1705ca4 100644 --- a/README.md +++ b/README.md @@ -5,27 +5,20 @@ FMElfinderBundle ### Code Quality Assurance ### -| Gitter | SL Insight | Travis CI | CoverAlls| License | -|----------------| ------------------------|-------------|-----------------|-----------------| -|[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=flat-square)](https://gitter.im/helios-ag/FMElfinderBundle)|[![SensioLabsInsight](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17/mini.png)](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17) -|[![Build Status](https://secure.travis-ci.org/helios-ag/FMElfinderBundle.png)](http://travis-ci.org/helios-ag/FMElfinderBundle) -|[![Coverage Status](https://coveralls.io/repos/helios-ag/FMElfinderBundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/helios-ag/FMElfinderBundle?branch=master) -[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE) - -[![Dependency Status](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4) -[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/stable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![Total Downloads](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/downloads.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![Latest Unstable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/unstable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) +| Gitter | SL Insight | TravisCI | Coverage| License |Dependencies| Version | Downloads | +|----------------| ------------------------|-------------|-----------------|-----------------|----------------|----------------|----------------| +|[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=flat-square)](https://gitter.im/helios-ag/FMElfinderBundle)|[![SensioLabsInsight](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17/mini.png)](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17)|[![Build Status](https://secure.travis-ci.org/helios-ag/FMElfinderBundle.png)](http://travis-ci.org/helios-ag/FMElfinderBundle)|[![Coverage Status](https://coveralls.io/repos/helios-ag/FMElfinderBundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/helios-ag/FMElfinderBundle?branch=master)|[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)|[![Dependency Status](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4)|[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/stable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle)|[![Total Downloads](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/downloads.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle)| **elFinder** is an open-source file manager for web, written in JavaScript using jQuery UI. Creation is inspired by simplicity and convenience of Finder program used in Mac OS X operating system. Recommended bundles to use with: + + | FMTinyMCEBundle | FMSummernoteBundle | IvoryCKEditorBundle| TrsteelCkeditorBundle | | ------------------------|-------------|-----------------|-----------------| -|[![FMTinyMCEBundle](https://img.shields.io/badge/FMTinyMCEBundle-download-brightgreen.svg)](https://github.com/helios-ag/FMTinyMCEBundle)| -[![IvoryCKEditorBundle](https://img.shields.io/badge/IvoryCKEditorBundle-download-orange.svg)](https://github.com/egeloen/IvoryCKEditorBundle)| -[![TrsteelCkeditorBundle](https://img.shields.io/badge/TrsteelCkeditorBundle-download-blue.svg)](https://github.com/trsteel88/TrsteelCkeditorBundle)| -[![FMSummernoteBundle](https://img.shields.io/badge/FMSummernoteBundle-download-brightgreen.svg)](https://github.com/helios-ag/summernote-bundle)| +|[![FMTinyMCEBundle](https://img.shields.io/badge/FMTinyMCEBundle-download-brightgreen.svg)](https://github.com/helios-ag/FMTinyMCEBundle)|[![IvoryCKEditorBundle](https://img.shields.io/badge/IvoryCKEditorBundle-download-orange.svg)](https://github.com/egeloen/IvoryCKEditorBundle)|[![TrsteelCkeditorBundle](https://img.shields.io/badge/TrsteelCkeditorBundle-download-blue.svg)](https://github.com/trsteel88/TrsteelCkeditorBundle)|[![FMSummernoteBundle](https://img.shields.io/badge/FMSummernoteBundle-download-brightgreen.svg)](https://github.com/helios-ag/summernote-bundle)| **Table of contents** From 41fd4a7ddfbda999744026473b387e25890a2a94 Mon Sep 17 00:00:00 2001 From: Al Ganiev Date: Mon, 7 Dec 2015 01:12:22 +1000 Subject: [PATCH 3/7] redistribitued badges --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1705ca4..75898c6 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,14 @@ FMElfinderBundle ### Code Quality Assurance ### -| Gitter | SL Insight | TravisCI | Coverage| License |Dependencies| Version | Downloads | -|----------------| ------------------------|-------------|-----------------|-----------------|----------------|----------------|----------------| -|[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=flat-square)](https://gitter.im/helios-ag/FMElfinderBundle)|[![SensioLabsInsight](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17/mini.png)](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17)|[![Build Status](https://secure.travis-ci.org/helios-ag/FMElfinderBundle.png)](http://travis-ci.org/helios-ag/FMElfinderBundle)|[![Coverage Status](https://coveralls.io/repos/helios-ag/FMElfinderBundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/helios-ag/FMElfinderBundle?branch=master)|[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)|[![Dependency Status](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4)|[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/stable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle)|[![Total Downloads](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/downloads.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle)| +| Gitter | SL Insight | TravisCI | Coverage| License | Version | +|----------------| ------------------------|-------------|-----------------|-----------------|----------------| +|[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=flat-square)](https://gitter.im/helios-ag/FMElfinderBundle)|[![SensioLabsInsight](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17/mini.png)](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17)|[![Build Status](https://secure.travis-ci.org/helios-ag/FMElfinderBundle.png)](http://travis-ci.org/helios-ag/FMElfinderBundle)|[![Coverage Status](https://coveralls.io/repos/helios-ag/FMElfinderBundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/helios-ag/FMElfinderBundle?branch=master)|[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)|[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/stable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle)| + + +|Dependencies| Downloads | +|-------------| +|[![Dependency Status](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4)|[![Total Downloads](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/downloads.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle)| **elFinder** is an open-source file manager for web, written in JavaScript using jQuery UI. From 43e2c9b9a03f893f0eaaf2f91e8cd17d720dbc45 Mon Sep 17 00:00:00 2001 From: Al Ganiev Date: Mon, 7 Dec 2015 01:13:09 +1000 Subject: [PATCH 4/7] redistribitued badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75898c6..d73f54b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ FMElfinderBundle |Dependencies| Downloads | -|-------------| +|-------------|----------| |[![Dependency Status](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4)|[![Total Downloads](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/downloads.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle)| From 560047f790e3e73aa5e40bf3585d65eb04615d0c Mon Sep 17 00:00:00 2001 From: Al Ganiev Date: Mon, 7 Dec 2015 00:10:07 +1000 Subject: [PATCH 5/7] updated readme, before tagging misprints redistribitued badges redistribitued badges --- README.md | 71 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 99504be..d73f54b 100644 --- a/README.md +++ b/README.md @@ -3,29 +3,27 @@ FMElfinderBundle [ElFinder](https://github.com/Studio-42/elFinder) integration in Symfony2 -### Gitter chat ### +### Code Quality Assurance ### -[![Join the chat at https://gitter.im/helios-ag/FMElfinderBundle](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/helios-ag/FMElfinderBundle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +| Gitter | SL Insight | TravisCI | Coverage| License | Version | +|----------------| ------------------------|-------------|-----------------|-----------------|----------------| +|[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=flat-square)](https://gitter.im/helios-ag/FMElfinderBundle)|[![SensioLabsInsight](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17/mini.png)](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17)|[![Build Status](https://secure.travis-ci.org/helios-ag/FMElfinderBundle.png)](http://travis-ci.org/helios-ag/FMElfinderBundle)|[![Coverage Status](https://coveralls.io/repos/helios-ag/FMElfinderBundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/helios-ag/FMElfinderBundle?branch=master)|[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)|[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/stable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle)| -### Code Quality Assurance ### -| SensioLabs Insight | Travis CI | CoverAlls| -| ------------------------|-------------|-----------------| -|[![SensioLabsInsight](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17/mini.png)](https://insight.sensiolabs.com/projects/604032ab-06ef-4ee2-b0cf-bb5240b9cd17)|[![Build Status](https://secure.travis-ci.org/helios-ag/FMElfinderBundle.png)](http://travis-ci.org/helios-ag/FMElfinderBundle)|[![Coverage Status](https://coveralls.io/repos/helios-ag/FMElfinderBundle/badge.svg?branch=master&service=github)](https://coveralls.io/github/helios-ag/FMElfinderBundle?branch=master) +|Dependencies| Downloads | +|-------------|----------| +|[![Dependency Status](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4)|[![Total Downloads](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/downloads.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle)| -[![Dependency Status](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56ae4b3ac897b60001d4) -[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/stable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![Total Downloads](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/downloads.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![Latest Unstable Version](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/v/unstable.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) [![License](https://poser.pugx.org/helios-ag/fm-elfinder-bundle/license.svg)](https://packagist.org/packages/helios-ag/fm-elfinder-bundle) -[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/helios-ag/fmelfinderbundle/trend.png)](https://bitdeli.com/free "Bitdeli Badge") **elFinder** is an open-source file manager for web, written in JavaScript using jQuery UI. Creation is inspired by simplicity and convenience of Finder program used in Mac OS X operating system. Recommended bundles to use with: -* [TinymceBundle](https://github.com/stfalcon/TinymceBundle/) -* [IvoryCKEditorBundle](https://github.com/egeloen/IvoryCKEditorBundle/) -* [TrsteelCkeditorBundle](https://github.com/trsteel88/TrsteelCkeditorBundle/) -* [FMSummernoteBundle](https://github.com/helios-ag/summernote-bundle/) + +| FMTinyMCEBundle | FMSummernoteBundle | IvoryCKEditorBundle| TrsteelCkeditorBundle | +| ------------------------|-------------|-----------------|-----------------| +|[![FMTinyMCEBundle](https://img.shields.io/badge/FMTinyMCEBundle-download-brightgreen.svg)](https://github.com/helios-ag/FMTinyMCEBundle)|[![IvoryCKEditorBundle](https://img.shields.io/badge/IvoryCKEditorBundle-download-orange.svg)](https://github.com/egeloen/IvoryCKEditorBundle)|[![TrsteelCkeditorBundle](https://img.shields.io/badge/TrsteelCkeditorBundle-download-blue.svg)](https://github.com/trsteel88/TrsteelCkeditorBundle)|[![FMSummernoteBundle](https://img.shields.io/badge/FMSummernoteBundle-download-brightgreen.svg)](https://github.com/helios-ag/summernote-bundle)| **Table of contents** @@ -61,12 +59,20 @@ Recommended bundles to use with: ## Installation -To install this bundle, you'll need both the lib [ElFinderPHP](https://github.com/helios-ag/ElFinderPHP) -and this bundle. +### Step 1: Installation -This instruction explain how to setup bundle on Symfony 2.1 and newer +**Version 6 (Symfony 3 Compatible):** + +Add FMElFinderBundle to your composer.json + +```json +{ + "require": { + "helios-ag/fm-elfinder-bundle": "~6", + } +} +``` -### Step 1: Installation **Version 5:** @@ -92,13 +98,13 @@ also add component-dir under config node of composer.json **Version 4:** -This version dont use **component** library +This version doesn't use **component** library ```sh composer require helios-ag/fm-elfinder-bundle: "~4.0" ``` -For Symfony between 2.1 and 2.3 (2.3 included) use version ~2.3 +For Symfony =<2.3 use version ~2.3 ```sh @@ -112,12 +118,6 @@ Now tell composer to download the bundle by running the command: composer update helios-ag/fm-elfinder-bundle ``` -Install legacy version of the bundle ([documentation](https://github.com/helios-ag/FMElfinderBundle/blob/1.0/README.md)): - -```sh -composer require helios-ag/fm-elfinder-bundle: "~1.5" -``` - ### Step 2: Enable the bundle Enable the bundle in the kernel: @@ -174,21 +174,24 @@ fm_elfinder: instances: default: locale: %locale% # defaults to current request locale - editor: ckeditor # other options are tinymce, tinymce4, form, custom and simple - fullscreen: true # defaults true, applies to simple and ckeditor editors - theme: smoothness # jquery theme + editor: ckeditor # other options are tinymce, tinymce4, fm_tinymce, form, simple, custom + #editor_template: set custom template for your editor # default null + #path_prefix: / # for setting custom assets path prefix, useful for non vhost configurations, i.e. http://127.0.0.1/mysite/ + #fullscreen: true|false # defaults true, applies to simple and ckeditor editors + #theme: smoothness # jquery theme, default is 'smoothness' include_assets: true # disable if you want to handle loading of the javascript and css assets yourself connector: - debug: false # defaults to false + #debug: true|false # defaults to false roots: # at least one root must be defined uploads: - show_hidden: false # defaults to false + #show_hidden: true|false # defaults to false, hide files that driver: LocalFileSystem path: uploads upload_allow: ['image/png', 'image/jpg', 'image/jpeg'] upload_deny: ['all'] upload_max_size: 2M - + #attributes: example of setting attributes permission + # - { pattern: '/(.*?)/', read: true, write: false, locked: true } ``` * default - instance of elfinder, can be used to define multiple configurations of ElFinder, allows simultaneous configuration for different types of WYSIWYG editors in your project @@ -198,7 +201,7 @@ fm_elfinder: * locale - locale determines, which language, ElFinder will use, to translate user interface, default is current request locale * cors_support - allows cross domain responses handling (default false) * editor - determines what template to render, to be compatible with WYSIWYG web editor, currently supported options are: - "ckeditor", "tinymce" for tinymce3, "tinymce4" for tinymce4, "form" for form type, "simple" for standalone and "custom". + "ckeditor" (to use with IvoryCKEditorBundle or TrsteelCkeditorBundle), "fm_tinymce" for tinymce4 (to use with FMTinyMCEBundle), "form" for form type, "simple" for standalone and "custom" for custom template. How to configure CKEDitor and TinyMCE to work with this bundle, will be explained further in this document. * editor_template - define template to render editor is set to "custom". * connector - root node for defining options for elfinder root directories. @@ -214,9 +217,7 @@ fm_elfinder: * upload_max_size: 2M You can see the full list of roots options [here](https://github.com/Studio-42/elFinder/wiki/Connector-configuration-options#root-options "connector options list"). To use them, -convert camelCased option name to under_scored option name. - -**Note:** `crypt_lib` option is not available as not implemented yet by elFinder PHP library. +convert camelCased option name to under_scored name. ### Use multiple upload folder by instance From c4c93a4072a45cd65b148c4d3553938777dd5e35 Mon Sep 17 00:00:00 2001 From: Al Ganiev Date: Mon, 7 Dec 2015 01:54:00 +1000 Subject: [PATCH 6/7] updated changelog --- CHANGELOG.md | 368 ++++++++------------------------------------------- 1 file changed, 58 insertions(+), 310 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8488852..dff8136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,416 +2,164 @@ ## [Unreleased](https://github.com/helios-ag/FMElfinderBundle/tree/HEAD) -[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/4.0.2...HEAD) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5.3...HEAD) -**Merged pull requests:** +**Closed issues:** -- Added tests for config formats and add support for XML [\#101](https://github.com/helios-ag/FMElfinderBundle/pull/101) ([WouterJ](https://github.com/WouterJ)) +- FMElfinderBundle shows white window [\#184](https://github.com/helios-ag/FMElfinderBundle/issues/184) +- fabric.image.fromURL [\#183](https://github.com/helios-ag/FMElfinderBundle/issues/183) -## [4.0.2](https://github.com/helios-ag/FMElfinderBundle/tree/4.0.2) (2015-03-20) +## [5.3](https://github.com/helios-ag/FMElfinderBundle/tree/5.3) (2015-11-15) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5.2.1...5.3) -[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/4.0.1...4.0.2) +## [5.2.1](https://github.com/helios-ag/FMElfinderBundle/tree/5.2.1) (2015-11-12) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5.2...5.2.1) **Closed issues:** -- S3 folder not shown after creation [\#120](https://github.com/helios-ag/FMElfinderBundle/issues/120) - -- Path issues and upload [\#118](https://github.com/helios-ag/FMElfinderBundle/issues/118) - -- ElFinder and two or more instances with ckeditor [\#117](https://github.com/helios-ag/FMElfinderBundle/issues/117) +- Assets not found [\#180](https://github.com/helios-ag/FMElfinderBundle/issues/180) -- liip image [\#84](https://github.com/helios-ag/FMElfinderBundle/issues/84) +## [5.2](https://github.com/helios-ag/FMElfinderBundle/tree/5.2) (2015-11-09) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5.1...5.2) -**Merged pull requests:** +**Closed issues:** -- connector options override [\#122](https://github.com/helios-ag/FMElfinderBundle/pull/122) ([nicolasmure](https://github.com/nicolasmure)) +- Encode / Decode Path [\#169](https://github.com/helios-ag/FMElfinderBundle/issues/169) +- Wrong mime type with flysystem s3 driver [\#164](https://github.com/helios-ag/FMElfinderBundle/issues/164) +- FMElfinderBundle shows nothing [\#159](https://github.com/helios-ag/FMElfinderBundle/issues/159) +- Why this bundle generates Symfony2 doctrine migration file? [\#157](https://github.com/helios-ag/FMElfinderBundle/issues/157) +- Path error with nested folders \(uploads/bob\) [\#152](https://github.com/helios-ag/FMElfinderBundle/issues/152) +- GridFs support ? \(Flysystem / Gaufrette\) [\#145](https://github.com/helios-ag/FMElfinderBundle/issues/145) -- S3 example configuration and url fix [\#119](https://github.com/helios-ag/FMElfinderBundle/pull/119) ([rehoehle](https://github.com/rehoehle)) +## [5.1](https://github.com/helios-ag/FMElfinderBundle/tree/5.1) (2015-09-24) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5.0.5...5.1) -## [4.0.1](https://github.com/helios-ag/FMElfinderBundle/tree/4.0.1) (2015-02-21) +**Closed issues:** -[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/4.0...4.0.1) +- S3 Driver [\#153](https://github.com/helios-ag/FMElfinderBundle/issues/153) -**Merged pull requests:** +## [5.0.5](https://github.com/helios-ag/FMElfinderBundle/tree/5.0.5) (2015-07-16) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5.0.4...5.0.5) -- Added homeFolder parameter to ElFinderType [\#115](https://github.com/helios-ag/FMElfinderBundle/pull/115) ([MateuszWilk](https://github.com/MateuszWilk)) +**Closed issues:** -## [4.0](https://github.com/helios-ag/FMElfinderBundle/tree/4.0) (2015-02-18) +- Unable to connect to the backend. [\#149](https://github.com/helios-ag/FMElfinderBundle/issues/149) +- Issue with adding images to ckeditor [\#148](https://github.com/helios-ag/FMElfinderBundle/issues/148) +- FMElfinder not created and an input persists [\#146](https://github.com/helios-ag/FMElfinderBundle/issues/146) +- Uncaught TypeError: a.indexOf is not a function \(IvoryCkEditor Insert Image\) [\#144](https://github.com/helios-ag/FMElfinderBundle/issues/144) +- Overriding templates [\#143](https://github.com/helios-ag/FMElfinderBundle/issues/143) +- Table created and not used. [\#141](https://github.com/helios-ag/FMElfinderBundle/issues/141) +- Elfinder Form Type [\#140](https://github.com/helios-ag/FMElfinderBundle/issues/140) +- Disallow creating/uploading new folder [\#139](https://github.com/helios-ag/FMElfinderBundle/issues/139) +- showhidden: false ! [\#136](https://github.com/helios-ag/FMElfinderBundle/issues/136) +- Plugin ?? [\#127](https://github.com/helios-ag/FMElfinderBundle/issues/127) -[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/3.4...4.0) +## [5.0.4](https://github.com/helios-ag/FMElfinderBundle/tree/5.0.4) (2015-04-11) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5.0.3...5.0.4) -**Implemented enhancements:** +## [5.0.3](https://github.com/helios-ag/FMElfinderBundle/tree/5.0.3) (2015-04-03) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5.0.2...5.0.3) -- Support new drivers via FlySystem [\#105](https://github.com/helios-ag/FMElfinderBundle/issues/105) +## [5.0.2](https://github.com/helios-ag/FMElfinderBundle/tree/5.0.2) (2015-04-02) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5.0.1...5.0.2) **Closed issues:** -- Enable CORS [\#106](https://github.com/helios-ag/FMElfinderBundle/issues/106) - -- Wrong url when select the picture [\#99](https://github.com/helios-ag/FMElfinderBundle/issues/99) +- php 5.4 syntax used \(symfony2 and the bundle itself state minimum requirement to \>= php 5.3.3\) [\#130](https://github.com/helios-ag/FMElfinderBundle/issues/130) +- Incorrect path [\#125](https://github.com/helios-ag/FMElfinderBundle/issues/125) -- dynamic 'path' setting ? [\#91](https://github.com/helios-ag/FMElfinderBundle/issues/91) +## [5.0.1](https://github.com/helios-ag/FMElfinderBundle/tree/5.0.1) (2015-03-23) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/5...5.0.1) -**Merged pull requests:** - -- updated README [\#114](https://github.com/helios-ag/FMElfinderBundle/pull/114) ([helios-ag](https://github.com/helios-ag)) - -- conv to unix [\#112](https://github.com/helios-ag/FMElfinderBundle/pull/112) ([helios-ag](https://github.com/helios-ag)) +**Closed issues:** -- flysystem driver support [\#111](https://github.com/helios-ag/FMElfinderBundle/pull/111) ([helios-ag](https://github.com/helios-ag)) +- ReferenceError: $ is not defined [\#87](https://github.com/helios-ag/FMElfinderBundle/issues/87) -- CORS and home folder guides [\#110](https://github.com/helios-ag/FMElfinderBundle/pull/110) ([nicolasmure](https://github.com/nicolasmure)) +## [5](https://github.com/helios-ag/FMElfinderBundle/tree/5) (2015-03-21) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/4.0.2...5) -- Multiple upload folder by instance [\#109](https://github.com/helios-ag/FMElfinderBundle/pull/109) ([nicolasmure](https://github.com/nicolasmure)) +## [4.0.2](https://github.com/helios-ag/FMElfinderBundle/tree/4.0.2) (2015-03-20) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/4.0.1...4.0.2) -- Non hard exit [\#108](https://github.com/helios-ag/FMElfinderBundle/pull/108) ([nicolasmure](https://github.com/nicolasmure)) +**Closed issues:** -- Add triggering of change event [\#107](https://github.com/helios-ag/FMElfinderBundle/pull/107) ([lexxpavlov](https://github.com/lexxpavlov)) +- S3 folder not shown after creation [\#120](https://github.com/helios-ag/FMElfinderBundle/issues/120) +- ElFinder and two or more instances with ckeditor [\#117](https://github.com/helios-ag/FMElfinderBundle/issues/117) -- overridable loader [\#104](https://github.com/helios-ag/FMElfinderBundle/pull/104) ([helios-ag](https://github.com/helios-ag)) +## [4.0.1](https://github.com/helios-ag/FMElfinderBundle/tree/4.0.1) (2015-02-21) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/4.0...4.0.1) -- IvoryCKEditor sample was incorrect [\#103](https://github.com/helios-ag/FMElfinderBundle/pull/103) ([kix](https://github.com/kix)) +## [4.0](https://github.com/helios-ag/FMElfinderBundle/tree/4.0) (2015-02-18) +[Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/3.4...4.0) ## [3.4](https://github.com/helios-ag/FMElfinderBundle/tree/3.4) (2015-01-20) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/3.3...3.4) -**Merged pull requests:** - -- Allow custom template renderer [\#97](https://github.com/helios-ag/FMElfinderBundle/pull/97) ([jdecool](https://github.com/jdecool)) - ## [3.3](https://github.com/helios-ag/FMElfinderBundle/tree/3.3) (2015-01-17) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/3.2.1...3.3) **Closed issues:** -- Relative path image [\#93](https://github.com/helios-ag/FMElfinderBundle/issues/93) - -- attach files? [\#90](https://github.com/helios-ag/FMElfinderBundle/issues/90) - - There is no "uglifycss" filter [\#77](https://github.com/helios-ag/FMElfinderBundle/issues/77) -**Merged pull requests:** - -- Fix test [\#96](https://github.com/helios-ag/FMElfinderBundle/pull/96) ([helios-ag](https://github.com/helios-ag)) - -- plugin\_support [\#95](https://github.com/helios-ag/FMElfinderBundle/pull/95) ([helios-ag](https://github.com/helios-ag)) - ## [3.2.1](https://github.com/helios-ag/FMElfinderBundle/tree/3.2.1) (2015-01-06) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/3.2...3.2.1) -**Merged pull requests:** - -- tinymce relative path [\#94](https://github.com/helios-ag/FMElfinderBundle/pull/94) ([helios-ag](https://github.com/helios-ag)) - ## [3.2](https://github.com/helios-ag/FMElfinderBundle/tree/3.2) (2014-12-28) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/2.3.3...3.2) -**Closed issues:** - -- add class. ``form-control`` [\#88](https://github.com/helios-ag/FMElfinderBundle/issues/88) - -**Merged pull requests:** - -- Assetic [\#92](https://github.com/helios-ag/FMElfinderBundle/pull/92) ([helios-ag](https://github.com/helios-ag)) - ## [2.3.3](https://github.com/helios-ag/FMElfinderBundle/tree/2.3.3) (2014-12-06) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/3.1...2.3.3) -**Closed issues:** - -- multi path folder. [\#86](https://github.com/helios-ag/FMElfinderBundle/issues/86) - -- get error - Undefined index: ckeditor - [\#85](https://github.com/helios-ag/FMElfinderBundle/issues/85) - -- Elfinder form type in form type collection [\#81](https://github.com/helios-ag/FMElfinderBundle/issues/81) - -- BC between 2.5 and 2.5.1 [\#80](https://github.com/helios-ag/FMElfinderBundle/issues/80) - -- Feature Request: ability to inject the VolumeDriver as a Service [\#66](https://github.com/helios-ag/FMElfinderBundle/issues/66) - -**Merged pull requests:** - -- Noassetic [\#89](https://github.com/helios-ag/FMElfinderBundle/pull/89) ([helios-ag](https://github.com/helios-ag)) - ## [3.1](https://github.com/helios-ag/FMElfinderBundle/tree/3.1) (2014-11-09) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/3.0...3.1) -**Closed issues:** - -- Customizing Elfinder form [\#82](https://github.com/helios-ag/FMElfinderBundle/issues/82) - -- Request : change the folder path [\#68](https://github.com/helios-ag/FMElfinderBundle/issues/68) - -**Merged pull requests:** - -- restored ability to use services as drivers [\#83](https://github.com/helios-ag/FMElfinderBundle/pull/83) ([helios-ag](https://github.com/helios-ag)) - ## [3.0](https://github.com/helios-ag/FMElfinderBundle/tree/3.0) (2014-11-07) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/2.3.2...3.0) -**Closed issues:** - -- unable to add symfony service as a volume driver [\#79](https://github.com/helios-ag/FMElfinderBundle/issues/79) - -**Merged pull requests:** - -- Update README.md [\#78](https://github.com/helios-ag/FMElfinderBundle/pull/78) ([rdohms](https://github.com/rdohms)) - ## [2.3.2](https://github.com/helios-ag/FMElfinderBundle/tree/2.3.2) (2014-10-29) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/2.5.1...2.3.2) -**Merged pull requests:** - -- Made the changes of patch 2.5.1 available in 2.3 [\#76](https://github.com/helios-ag/FMElfinderBundle/pull/76) ([gl005](https://github.com/gl005)) - ## [2.5.1](https://github.com/helios-ag/FMElfinderBundle/tree/2.5.1) (2014-10-24) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/2.5...2.5.1) -**Closed issues:** - -- How to disable command? [\#74](https://github.com/helios-ag/FMElfinderBundle/issues/74) - -- Injecting Non existent Service Symfony <=2.3 [\#71](https://github.com/helios-ag/FMElfinderBundle/issues/71) - -- Symfony version in composer.json [\#61](https://github.com/helios-ag/FMElfinderBundle/issues/61) - -**Merged pull requests:** - -- Multiple elfinder instances in one page/form [\#75](https://github.com/helios-ag/FMElfinderBundle/pull/75) ([gl005](https://github.com/gl005)) - ## [2.5](https://github.com/helios-ag/FMElfinderBundle/tree/2.5) (2014-10-11) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/2.3.1...2.5) ## [2.3.1](https://github.com/helios-ag/FMElfinderBundle/tree/2.3.1) (2014-10-10) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/2.3.0...2.3.1) ## [2.3.0](https://github.com/helios-ag/FMElfinderBundle/tree/2.3.0) (2014-10-03) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/2.1...2.3.0) -**Closed issues:** - -- Relative path in 'form' instance [\#72](https://github.com/helios-ag/FMElfinderBundle/issues/72) - -- Unrecognized options "instances" under "fm\_elfinder" [\#67](https://github.com/helios-ag/FMElfinderBundle/issues/67) - -**Merged pull requests:** - -- Fix dialog icons css [\#73](https://github.com/helios-ag/FMElfinderBundle/pull/73) ([ZeBigDuck](https://github.com/ZeBigDuck)) - -- showhidden in another node [\#70](https://github.com/helios-ag/FMElfinderBundle/pull/70) ([stiig](https://github.com/stiig)) - -- Required only necessary dependencies [\#69](https://github.com/helios-ag/FMElfinderBundle/pull/69) ([hason](https://github.com/hason)) - ## [2.1](https://github.com/helios-ag/FMElfinderBundle/tree/2.1) (2014-08-24) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/v2.0...2.1) -**Closed issues:** - -- Upload file window [\#65](https://github.com/helios-ag/FMElfinderBundle/issues/65) - -- Change of image URL [\#64](https://github.com/helios-ag/FMElfinderBundle/issues/64) - ## [v2.0](https://github.com/helios-ag/FMElfinderBundle/tree/v2.0) (2014-08-09) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/1.5...v2.0) -**Closed issues:** - -- DataFixtures error? [\#62](https://github.com/helios-ag/FMElfinderBundle/issues/62) - -- \[Insight\] The Symfony Dependency Injection Container should not be passed as an argument [\#57](https://github.com/helios-ag/FMElfinderBundle/issues/57) - -- Image absolute/relative path [\#56](https://github.com/helios-ag/FMElfinderBundle/issues/56) - -**Merged pull requests:** - -- Wrap READ and WRITE columns in quotes [\#63](https://github.com/helios-ag/FMElfinderBundle/pull/63) ([loostro](https://github.com/loostro)) - -- 2.0 [\#60](https://github.com/helios-ag/FMElfinderBundle/pull/60) ([helios-ag](https://github.com/helios-ag)) - -- Update composer.json [\#59](https://github.com/helios-ag/FMElfinderBundle/pull/59) ([Koalabaerchen](https://github.com/Koalabaerchen)) - -- Update ElFinderFile.php [\#58](https://github.com/helios-ag/FMElfinderBundle/pull/58) ([p-bizouard](https://github.com/p-bizouard)) - ## [1.5](https://github.com/helios-ag/FMElfinderBundle/tree/1.5) (2014-05-09) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/1.4.2...1.5) -**Closed issues:** - -- Standalone elfinder [\#55](https://github.com/helios-ag/FMElfinderBundle/issues/55) - -- Is or will be there a way to set metadata for media files in elfinder? [\#54](https://github.com/helios-ag/FMElfinderBundle/issues/54) - -- S3 integration [\#53](https://github.com/helios-ag/FMElfinderBundle/issues/53) - -- ElFinder resize doesn't update image dimensions [\#52](https://github.com/helios-ag/FMElfinderBundle/issues/52) - -- config error - parse asset\[bundles/stfalcontinymce/vendor/ [\#48](https://github.com/helios-ag/FMElfinderBundle/issues/48) - ## [1.4.2](https://github.com/helios-ag/FMElfinderBundle/tree/1.4.2) (2013-12-19) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/1.4.1...1.4.2) -**Merged pull requests:** - -- Add a Bitdeli Badge to README [\#51](https://github.com/helios-ag/FMElfinderBundle/pull/51) ([bitdeli-chef](https://github.com/bitdeli-chef)) - ## [1.4.1](https://github.com/helios-ag/FMElfinderBundle/tree/1.4.1) (2013-11-13) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/1.4...1.4.1) -**Closed issues:** - -- Hi [\#46](https://github.com/helios-ag/FMElfinderBundle/issues/46) - -- default \(ckeditor\) template requires yui\_css and yui\_js filters [\#44](https://github.com/helios-ag/FMElfinderBundle/issues/44) - -- Configuration of elfinder path [\#42](https://github.com/helios-ag/FMElfinderBundle/issues/42) - -- Problems with dump assets image path and CSSEMBED [\#34](https://github.com/helios-ag/FMElfinderBundle/issues/34) - -**Merged pull requests:** - -- document new config options, fix ckeditor compressed template [\#50](https://github.com/helios-ag/FMElfinderBundle/pull/50) ([dbu](https://github.com/dbu)) - -- Use request locale as default [\#49](https://github.com/helios-ag/FMElfinderBundle/pull/49) ([EmmanuelVella](https://github.com/EmmanuelVella)) - ## [1.4](https://github.com/helios-ag/FMElfinderBundle/tree/1.4) (2013-10-03) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/1.3...1.4) -**Closed issues:** - -- Cannot rename files/folders [\#45](https://github.com/helios-ag/FMElfinderBundle/issues/45) - -- Installation problem [\#41](https://github.com/helios-ag/FMElfinderBundle/issues/41) - -- so slow ? [\#35](https://github.com/helios-ag/FMElfinderBundle/issues/35) - -**Merged pull requests:** - -- Cmf [\#47](https://github.com/helios-ag/FMElfinderBundle/pull/47) ([helios-ag](https://github.com/helios-ag)) - -- fix dialog image position [\#43](https://github.com/helios-ag/FMElfinderBundle/pull/43) ([nykopol](https://github.com/nykopol)) - ## [1.3](https://github.com/helios-ag/FMElfinderBundle/tree/1.3) (2013-08-27) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/1.2...1.3) -**Closed issues:** - -- no \_popup.js in STFalconTinyMCE public resources [\#39](https://github.com/helios-ag/FMElfinderBundle/issues/39) - -- typo? in docs - step 3 [\#38](https://github.com/helios-ag/FMElfinderBundle/issues/38) - -- in Prod mode error 500 [\#36](https://github.com/helios-ag/FMElfinderBundle/issues/36) - -- Integration with Tinymce 4 [\#33](https://github.com/helios-ag/FMElfinderBundle/issues/33) - -- Standalone filebrowser usage [\#28](https://github.com/helios-ag/FMElfinderBundle/issues/28) - -**Merged pull requests:** - -- Tinymce4 [\#37](https://github.com/helios-ag/FMElfinderBundle/pull/37) ([helios-ag](https://github.com/helios-ag)) - ## [1.2](https://github.com/helios-ag/FMElfinderBundle/tree/1.2) (2013-08-03) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/1.1...1.2) -**Closed issues:** - -- RangeError when loading elfinder [\#31](https://github.com/helios-ag/FMElfinderBundle/issues/31) - -**Merged pull requests:** - -- Fix \#31 Uncaught RangeError: Maximum call stack size exceeded in some browsers [\#32](https://github.com/helios-ag/FMElfinderBundle/pull/32) ([wcoppens](https://github.com/wcoppens)) - -- added feature to use a symfony service as a volumeDriver [\#30](https://github.com/helios-ag/FMElfinderBundle/pull/30) ([sjopet](https://github.com/sjopet)) - -- Added support for an optional 'url' parameter in the 'roots' section [\#29](https://github.com/helios-ag/FMElfinderBundle/pull/29) ([rjbijl](https://github.com/rjbijl)) - ## [1.1](https://github.com/helios-ag/FMElfinderBundle/tree/1.1) (2013-06-12) - [Full Changelog](https://github.com/helios-ag/FMElfinderBundle/compare/1.0...1.1) -**Closed issues:** - -- Dependency twig-bundle is wrong for SF 2.3 [\#26](https://github.com/helios-ag/FMElfinderBundle/issues/26) - -- Image path in CSS are broken [\#25](https://github.com/helios-ag/FMElfinderBundle/issues/25) - -**Merged pull requests:** - -- Issues \#25 & \#26 fix [\#27](https://github.com/helios-ag/FMElfinderBundle/pull/27) ([phpmike](https://github.com/phpmike)) - ## [1.0](https://github.com/helios-ag/FMElfinderBundle/tree/1.0) (2013-06-07) -**Closed issues:** - -- Missing icon images [\#23](https://github.com/helios-ag/FMElfinderBundle/issues/23) - -- CSS generation with assetic [\#20](https://github.com/helios-ag/FMElfinderBundle/issues/20) - -- Variable "fullscreen" does not exist and images not loading [\#17](https://github.com/helios-ag/FMElfinderBundle/issues/17) - -- Elfinder slow loading [\#15](https://github.com/helios-ag/FMElfinderBundle/issues/15) - -- Bad asset URL [\#14](https://github.com/helios-ag/FMElfinderBundle/issues/14) - -- Standalone filebrowser [\#13](https://github.com/helios-ag/FMElfinderBundle/issues/13) - -- Javascripts missing [\#12](https://github.com/helios-ag/FMElfinderBundle/issues/12) - -- Dependency error [\#11](https://github.com/helios-ag/FMElfinderBundle/issues/11) - -- Overriding FMElfinderLoader [\#9](https://github.com/helios-ag/FMElfinderBundle/issues/9) - -- Assetic cssrewrite css image path [\#3](https://github.com/helios-ag/FMElfinderBundle/issues/3) - -- Browse Image Return Value in Integration with CKEditor [\#2](https://github.com/helios-ag/FMElfinderBundle/issues/2) - -- install error [\#1](https://github.com/helios-ag/FMElfinderBundle/issues/1) - -**Merged pull requests:** - -- Fix for images in CSS for newer version of AsseticBundle and cssrewriter [\#24](https://github.com/helios-ag/FMElfinderBundle/pull/24) ([dlancea](https://github.com/dlancea)) - -- fix templates & filters for assetic [\#22](https://github.com/helios-ag/FMElfinderBundle/pull/22) ([thibmonier](https://github.com/thibmonier)) - -- Update compiled path for assetic js & css [\#21](https://github.com/helios-ag/FMElfinderBundle/pull/21) ([thibmonier](https://github.com/thibmonier)) - -- fullscreen option [\#18](https://github.com/helios-ag/FMElfinderBundle/pull/18) ([devantoine](https://github.com/devantoine)) - -- El finder php [\#16](https://github.com/helios-ag/FMElfinderBundle/pull/16) ([helios-ag](https://github.com/helios-ag)) - -- Integration with TinyMCE bundle [\#10](https://github.com/helios-ag/FMElfinderBundle/pull/10) ([helios-ag](https://github.com/helios-ag)) - -- Update README.md [\#8](https://github.com/helios-ag/FMElfinderBundle/pull/8) ([chibani](https://github.com/chibani)) - -- TinyMCE integration + Multiple roots configuration [\#6](https://github.com/helios-ag/FMElfinderBundle/pull/6) ([slashfan](https://github.com/slashfan)) - -- Elfinder fullscreen [\#5](https://github.com/helios-ag/FMElfinderBundle/pull/5) ([kiddo13](https://github.com/kiddo13)) - -- Ckeditor integration fix [\#4](https://github.com/helios-ag/FMElfinderBundle/pull/4) ([kiddo13](https://github.com/kiddo13)) - -- Fixed JS throwing errors [\#19](https://github.com/helios-ag/FMElfinderBundle/pull/19) ([devantoine](https://github.com/devantoine)) - -- Using with TrsteelCkeditorBundle [\#7](https://github.com/helios-ag/FMElfinderBundle/pull/7) ([isqad88](https://github.com/isqad88)) - - \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file From e06272900980304998973137f46a0507b9ff426d Mon Sep 17 00:00:00 2001 From: Al Ganiev Date: Mon, 7 Dec 2015 01:56:20 +1000 Subject: [PATCH 7/7] rearranged column titles --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d73f54b..090c30e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Creation is inspired by simplicity and convenience of Finder program used in Mac Recommended bundles to use with: -| FMTinyMCEBundle | FMSummernoteBundle | IvoryCKEditorBundle| TrsteelCkeditorBundle | +| FMTinyMCEBundle | IvoryCKEditorBundle | TrsteelCkeditorBundle| FMSummernoteBundle | | ------------------------|-------------|-----------------|-----------------| |[![FMTinyMCEBundle](https://img.shields.io/badge/FMTinyMCEBundle-download-brightgreen.svg)](https://github.com/helios-ag/FMTinyMCEBundle)|[![IvoryCKEditorBundle](https://img.shields.io/badge/IvoryCKEditorBundle-download-orange.svg)](https://github.com/egeloen/IvoryCKEditorBundle)|[![TrsteelCkeditorBundle](https://img.shields.io/badge/TrsteelCkeditorBundle-download-blue.svg)](https://github.com/trsteel88/TrsteelCkeditorBundle)|[![FMSummernoteBundle](https://img.shields.io/badge/FMSummernoteBundle-download-brightgreen.svg)](https://github.com/helios-ag/summernote-bundle)|