Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tinyMCE use document "scriptoptions", and allow to override tinyMCE Javascript parameters #11157

Merged
merged 12 commits into from
Oct 1, 2016
Merged

tinyMCE use document "scriptoptions", and allow to override tinyMCE Javascript parameters #11157

merged 12 commits into from
Oct 1, 2016

Commits on Jul 3, 2016

  1. tinymce initialization, use addScriptOptions and tinymce-init.js

    @Fedik
    Fedik committed Jul 3, 2016
    Configuration menu
    Copy the full SHA
    b17b3cb View commit details
    Browse the repository at this point in the history

  2. Finalize tinymce-init.js

    @Fedik
    Fedik committed Jul 3, 2016
    Configuration menu
    Copy the full SHA
    de5e16f View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2016

  1. Sync. Merge branch 'master' into tinymce-scriptoptions 

    Conflicts:
	plugins/editors/tinymce/tinymce.php
    @Fedik
    Fedik committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    20cb7bc View commit details
    Browse the repository at this point in the history

  2. Small improve for code duplication

    @Fedik
    Fedik committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    6081963 View commit details
    Browse the repository at this point in the history

  3. Allow multiple editors with diferent options

    @Fedik
    Fedik committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    0eb5b98 View commit details
    Browse the repository at this point in the history

  4. Setup default options for the editor script only once

    @Fedik
    Fedik committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    f9fc424 View commit details
    Browse the repository at this point in the history

  5. Minified version of tinymce-init

    @Fedik
    Fedik committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    aba6e40 View commit details
    Browse the repository at this point in the history

  6. code style

    @Fedik
    Fedik committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    7b4b16c View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2016

  1. Sync. Merge branch 'master' into tinymce-scriptoptions

    @Fedik
    Fedik committed Aug 18, 2016
    Configuration menu
    Copy the full SHA
    bc785a3 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2016

  1. Sync. Merge branch 'master' into tinymce-scriptoptions 

    Conflicts:
	plugins/editors/tinymce/tinymce.php
    @Fedik
    Fedik committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    1fb5519 View commit details
    Browse the repository at this point in the history

  2. Improve a bit

    @Fedik
    Fedik committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    7804f39 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2016

  1. Sync. Merge branch 'master' into tinymce-scriptoptions 

     Conflicts:
	plugins/editors/tinymce/tinymce.php
    @Fedik
    Fedik committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    71b8a85 View commit details
    Browse the repository at this point in the history