Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tinymce/tinymce
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: Accelo/tinymce
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 362 files changed
  • 4 contributors

Commits on Dec 11, 2017

  1. Feature: Allow modern inline mode to disable autohide and to configur… 

    …e panel border width
    @KurtWagner
    KurtWagner committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    225ef5f View commit details
    Browse the repository at this point in the history

  2. Release 4.7.4-accelo.1

    @KurtWagner
    KurtWagner committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    b46c7ff View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. Merge pull request #1 from Accelo/inline-auto-hide 

    Feature: Allow modern inline mode to disable autohide and to configur…
    @KurtWagner
    KurtWagner authored Feb 21, 2018
    Configuration menu
    Copy the full SHA
    c837bad View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:Accelo/tinymce

    @KurtWagner
    KurtWagner committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    7c29a14 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' 

     Conflicts:
	.gitignore
	package.json
	src/themes/modern/src/main/js/api/Settings.js
	src/themes/modern/src/main/js/modes/Inline.js
    @KurtWagner
    KurtWagner committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    ff17712 View commit details
    Browse the repository at this point in the history

  4. Added notes explaining how to update our fork from upstream

    @KurtWagner
    KurtWagner committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    9b7aa82 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2019

  1. Dont hide editor when focus is changed from one editor to other

    Tuan Nguyen committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    717efdd View commit details
    Browse the repository at this point in the history

  2. Added back blank line

    Tuan Nguyen committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    1de0d9f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from vdtn359/master 

    Dont hide editor when focus is changed from one editor to other
    @cebjyre
    cebjyre authored Mar 20, 2019
    Configuration menu
    Copy the full SHA
    3666e66 View commit details
    Browse the repository at this point in the history

  4. Merge branch '4.x' of github.com:tinymce/tinymce

    Tuan Nguyen committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    69eaac1 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2019

  1. Locked down dependencies

    Tuan Nguyen committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    1efab89 View commit details
    Browse the repository at this point in the history

  2. Build version 4.9.3. Fix typescript error

    Tuan Nguyen committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    d87c914 View commit details
    Browse the repository at this point in the history

  3. Release 4.9.3-accelo.1

    Tuan Nguyen committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    5197c52 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2019

  1. Merge pull request #3 from vdtn359/master 

    Upgrade tinymce to version 4.9.3
    @cebjyre
    cebjyre authored Apr 1, 2019
    Configuration menu
    Copy the full SHA
    0642b00 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2019

  1. Fix postinstall script to avoid grunt failling

    Si Nguyen committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    ec2cd09 View commit details
    Browse the repository at this point in the history

  2. Add package-lock.json to lock down dependencies version

    Si Nguyen committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    dd90497 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2019

  1. Fixed a bug where Insert Link doesn't autofill multiline Highlighted … 

    …Text #AFFINITY-26680
    Si Nguyen committed May 1, 2019
    Configuration menu
    Copy the full SHA
    f2e8bef View commit details
    Browse the repository at this point in the history

  2. Release 4.9.3-accelo.2

    Si Nguyen committed May 1, 2019
    Configuration menu
    Copy the full SHA
    69b187b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from nguyenphusi/master 

    Fixed bug where Insert Link doesn't autofill multiline Highlighted Text
    @cebjyre
    cebjyre authored May 1, 2019
    Configuration menu
    Copy the full SHA
    c74e668 View commit details
    Browse the repository at this point in the history
Loading