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.

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

Fix android rich text errors #949

Merged
merged 25 commits into from
May 15, 2019
Merged

Fix android rich text errors #949

merged 25 commits into from
May 15, 2019

Commits on May 2, 2019

  1. Squashed commit of the following:

    commit 72f934e
    Merge: c935c81 d46cebd
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu May 2 10:32:48 2019 +0300
    
        Merge branch 'develop' into fix/list-handling-in-android
    
    commit c935c81
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu May 2 09:48:36 2019 +0300
    
        Don't use a lambda, to avoid bringing in Java8 features
    
    commit d46cebd
    Merge: 42d8443 09f1ca7
    Author: etoledom <etoledom@icloud.com>
    Date:   Wed May 1 09:37:06 2019 +0200
    
        Merge pull request #890 from wordpress-mobile/issue/autoscroll-on-list-block
    
        [iOS] Activate autoscroll on ListBlock
    
    commit 04610cc
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Wed May 1 00:56:33 2019 +0300
    
        Need to include the kotlin plugin dep location
    
    commit 52832ce
    Merge: 897d272 42d8443
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Wed May 1 00:26:57 2019 +0300
    
        Merge branch 'develop' into fix/list-handling-in-android
    
    commit 897d272
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Wed May 1 00:11:36 2019 +0300
    
        Set Aztec t delete the Enter for paragraph block
    
    commit ca2a93f
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Tue Apr 30 20:24:28 2019 +0300
    
        Update GB from its master
    
    commit 0417343
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Tue Apr 30 19:58:53 2019 +0300
    
        Utilize isEnterPressedUnderway
    
    commit 991f8a8
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Tue Apr 30 18:10:09 2019 +0300
    
        Use Aztec helper isEnterPressedUnderway
    
    commit 09f1ca7
    Merge: 61b52cb 42d8443
    Author: etoledom <etoledom@icloud.com>
    Date:   Tue Apr 30 13:26:04 2019 +0200
    
        Merge branch 'develop' into issue/autoscroll-on-list-block
    
    commit 61b52cb
    Author: etoledom <etoledom@icloud.com>
    Date:   Tue Apr 30 13:25:10 2019 +0200
    
        Update gutenberg ref to master
    
    commit 57c8de0
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Fri Apr 26 15:13:02 2019 +0300
    
        Use a git tag to try please JitPack
    
    commit ab4f3e3
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Fri Apr 26 15:07:33 2019 +0300
    
        Use shortened hash version to try please JitPack
    
    commit ce92f47
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Fri Apr 26 14:43:16 2019 +0300
    
        Update Aztec ref
    
    commit 7897f98
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 16:07:12 2019 +0300
    
        Update Aztec ref
    
    commit 76678c9
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 15:13:06 2019 +0300
    
        Minimize diff
    
    commit cd97945
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 13:03:12 2019 +0300
    
        Update GB hash
    
    commit c3f094a
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 12:44:16 2019 +0300
    
        Update GB hash
    
    commit 7391049
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 12:02:19 2019 +0300
    
        Update GB hash
    
    commit 70112bf
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 04:11:43 2019 +0300
    
        Update GB hash
    
    commit 91c222e
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 03:21:56 2019 +0300
    
        Update GB hash to use iOS regression fixes
    
    commit 1786fab
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 03:20:19 2019 +0300
    
        Use simplified access to EnterPressedUnderway
    
    commit 166b206
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 03:15:37 2019 +0300
    
        Remove temporary code
    
    commit d17e5d2
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 02:05:01 2019 +0300
    
        Use Aztec ref with the Enter processing fix
    
    commit bbda142
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 02:00:41 2019 +0300
    
        Use the GB hash with the rich-text fix
    
    commit 8889b8d
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Thu Apr 25 01:58:58 2019 +0300
    
        Don't emit text changed event when Enter detected
    
        The Enter event (ReactAztecEnterEvent) will have the text that the RN
        side needs to process through the format-lib and hopefully match Aztec's
        processing.
    
    commit 38cdc59
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Tue Apr 23 11:54:54 2019 +0300
    
        Use passed selection when Enter already altered text
    
    commit 2372231
    Author: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
    Date:   Tue Apr 23 10:11:51 2019 +0300
    
        Signal if text has already been changed
    
    commit 1a4f344
    Author: etoledom <etoledom@icloud.com>
    Date:   Fri Apr 19 18:14:16 2019 +0200
    
        Update gutenberg ref
    
    commit abc09d1
    Merge: c6ca773 0be0fa2
    Author: etoledom <etoledom@icloud.com>
    Date:   Fri Apr 19 17:49:27 2019 +0200
    
        Merge branch 'develop' into issue/autoscroll-on-list-block
    
    commit c6ca773
    Author: etoledom <etoledom@icloud.com>
    Date:   Fri Apr 19 17:49:17 2019 +0200
    
        Update gutenberg ref
    
    commit a521284
    Author: etoledom <etoledom@icloud.com>
    Date:   Thu Apr 18 17:01:53 2019 +0200
    
        Update gutenberg ref
    Tug committed May 2, 2019
    Configuration menu
    Copy the full SHA
    014bb9c View commit details
    Browse the repository at this point in the history
  2. Update gutenberg ref

    Tug committed May 2, 2019
    Configuration menu
    Copy the full SHA
    da206d3 View commit details
    Browse the repository at this point in the history
  3. Retain cursor position on select

    Tug committed May 2, 2019
    Configuration menu
    Copy the full SHA
    50c4652 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    abeffb3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    703a0a4 View commit details
    Browse the repository at this point in the history
  6. Update gutenberg ref

    Tug committed May 2, 2019
    Configuration menu
    Copy the full SHA
    aeeb7ba View commit details
    Browse the repository at this point in the history

Commits on May 3, 2019

  1. Configuration menu
    Copy the full SHA
    d1d0b64 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2019

  1. Update gutenberg ref

    Tug committed May 6, 2019
    Configuration menu
    Copy the full SHA
    8dfb6f8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2495469 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. Update gutenberg ref

    Tug committed May 7, 2019
    Configuration menu
    Copy the full SHA
    063d5bd View commit details
    Browse the repository at this point in the history
  2. Update gutenberg ref

    Tug committed May 7, 2019
    Configuration menu
    Copy the full SHA
    f7ed45f View commit details
    Browse the repository at this point in the history

Commits on May 8, 2019

  1. Update gutenberg ref

    Tug committed May 8, 2019
    Configuration menu
    Copy the full SHA
    1c2c67a View commit details
    Browse the repository at this point in the history
  2. Fix CI tests

    Tug committed May 8, 2019
    Configuration menu
    Copy the full SHA
    40a415b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cceace8 View commit details
    Browse the repository at this point in the history
  4. Revert "REMOVE ME BEFORE MERGE: simplify initial html"

    This reverts commit abeffb3.
    Tug committed May 8, 2019
    Configuration menu
    Copy the full SHA
    95f7d9a View commit details
    Browse the repository at this point in the history

Commits on May 9, 2019

  1. Update Gutenberg hash

    hypest committed May 9, 2019
    Configuration menu
    Copy the full SHA
    9fe49e6 View commit details
    Browse the repository at this point in the history
  2. Update gutenberg ref

    etoledom committed May 9, 2019
    Configuration menu
    Copy the full SHA
    049389f View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. Configuration menu
    Copy the full SHA
    6556d28 View commit details
    Browse the repository at this point in the history
  2. Update GB hash

    hypest committed May 13, 2019
    Configuration menu
    Copy the full SHA
    30d52c9 View commit details
    Browse the repository at this point in the history
  3. Update gutenberg ref

    etoledom committed May 13, 2019
    Configuration menu
    Copy the full SHA
    dead219 View commit details
    Browse the repository at this point in the history
  4. Update gutenberg ref

    etoledom committed May 13, 2019
    Configuration menu
    Copy the full SHA
    f1286ce View commit details
    Browse the repository at this point in the history
  5. Update gutenberg ref

    etoledom committed May 13, 2019
    Configuration menu
    Copy the full SHA
    fde8338 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2019

  1. Update from develop

    hypest committed May 14, 2019
    Configuration menu
    Copy the full SHA
    d8a7253 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2019

  1. Update gutenberg ref

    etoledom committed May 15, 2019
    Configuration menu
    Copy the full SHA
    e4d23fa View commit details
    Browse the repository at this point in the history
  2. Update gutenberg ref

    Tug committed May 15, 2019
    Configuration menu
    Copy the full SHA
    a0240cd View commit details
    Browse the repository at this point in the history