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

Release/1.5.0 #988

Merged
merged 76 commits into from
May 17, 2019
Merged

Release/1.5.0 #988

merged 76 commits into from
May 17, 2019

Conversation

koke
Copy link
Member

@koke koke commented May 16, 2019 •
edited
Loading

This merges release/1.5.0 to master for the next releases of the WPiOS/WPAndroid apps.

Related PR on WPiOS: wordpress-mobile/WordPress-iOS#11712
Related PR on Aztec iOS: N/A
Related PR on WPAndroid: wordpress-mobile/WordPress-Android#9876
Related PR on Aztec Android: N/A

etoledom and others added 30 commits April 29, 2019 19:46
@etoledom
Update gutenberg ref
ae6d3da
@etoledom
Merge pull request #940 from wordpress-mobile/try/test-uitest-ci
64eb0a7 
Add Image Caption Styling
@mchowning
Add textAlign prop for setting horizontal gravity on Android
0f23262
@etoledom
Adding text alignment attribute to Aztec Wrapper iOS
5dd53d9
@etoledom
Cleanup RCTAztecViewManager
ecf86a5
@iamthomasbishop
Add instructions for running simulator with other iOS devices.
0649a51
@Tug
Squashed commit of the following:
014bb9c 
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
Update gutenberg ref
da206d3
@Tug
Retain cursor position on select
50c4652
@Tug
REMOVE ME BEFORE MERGE: simplify initial html
abeffb3
@Tug
Do not clear current block selection when adding a block
703a0a4
@Tug
Update gutenberg ref
aeeb7ba
@iamthomasbishop
Reset unintended whitespace removals
daacd40
@etoledom
Update gutenberg ref to master
b005b02
@etoledom
Merge branch 'develop' into feature/caption
26ddf42
@mchowning
Merge branch 'feature/caption' into feature/add_text_align_prop
3dd0968 
Leaving merge conflict to be resolved manually
@mchowning
Manually resolving merge conflict
ce50de3
@mchowning
Update gutenberg ref
c109209
@pinarol
Revert "Update gutenberg repo to point to `rnmobile/master-fork-befor…
d31b4b6 
…e-richtext-selection-state-change`"

This reverts commit d4f4084.
@loremattei
Merge pull request #957 from wordpress-mobile/release/1.4.0
8020dd3 
Merge Release/1.4.0 into develop
@mchowning
Update gutenberg ref
46bbc2f
@Tug
Simplify onSplit in BlockHolder and make it the same as the web version
d1d0b64
@Tug
Update gutenberg ref
8dfb6f8
@iamthomasbishop
Clean up instructions copy
c1dfb9e 
- Specify device _simulators_
- Remove bit about opening target device in Simulator prior to running `yarn ios`
@iamthomasbishop
Merge pull request #944 from wordpress-mobile/update/add-ios-simulato…
25f671f 
…r-device-instructions

Add instructions for running simulator with other iOS devices to README
@Tug
Merge remote-tracking branch 'origin/develop' into fix/android-rich-t…
2495469 
…ext-errors
@Tug
Update gutenberg ref
063d5bd
@jtreanor
CircleCI: Limit max Jest and Flow workers to avoid memory errors
c30138b
@Tug
Update gutenberg ref
f7ed45f
@jtreanor
Use 'yarn x' syntax instead of 'yarn run x'
a5d68eb
etoledom and others added 12 commits May 15, 2019 15:05
@etoledom
Merge branch 'develop' into feature/caption
3b0ec1f
@hypest
Add a release notes file
467c015
@hypest
Start from the next version
0314fe7
@hypest
Add a PR template, nudging for release-notes update too
921e3e3
@hypest
Point to AztecAndroid's v1.3.27 tag
912f2dd
@hypest
Merge pull request #983 from wordpress-mobile/update/aztec-android-to…
eba1b5f 
…-1.3.27

Use AztecAndroid's v1.3.27 tag
@etoledom
Update gutenberg ref to master
68254be
@etoledom
Merge pull request #975 from wordpress-mobile/feature/caption
2d448a3 
Rich Image Caption feature branch
@mkevins
Merge hotfix v1.4.1 back to develop
4faf53b
@hypest
Merge pull request #985 from wordpress-mobile/fix/merge-hotfix-v1.4.1…
2df7310 
…-back-to-develop

Merge hotfix v1.4.1 back to develop
@hypest
Merge pull request #982 from wordpress-mobile/issue/786-add-release-n…
b2c1e28 
…otes-file

Add release notes file
@etoledom
Update gutenberg ref
3e70f8d
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented May 16, 2019 •
edited
Loading

Warnings
⚠️ PR is missing at least one label.
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

@koke koke added this to the v1.5 milestone May 16, 2019
This was referenced May 16, 2019
Merged
Merged
@koke
Copy link
Member Author

koke commented May 17, 2019

I found an issue with lists not getting focused automatically when inserted, which aggravates the existing issue with blank lines on lists (#954), as tapping on the recently inserted list will put the cursor on the stray line.

lists-focus

@etoledom @koke
Fix insert list block focus (#994)
b70d68e 
* Update gutenberg ref

* Update JS bundles

* Update gutenberg ref
@koke koke requested a review from etoledom May 17, 2019 12:29
@koke koke marked this pull request as ready for review May 17, 2019 12:29
@etoledom
Copy link
Contributor

I found an issue with lists not getting focused automatically when inserted

Fixed by #994

etoledom
etoledom approved these changes May 17, 2019
View reviewed changes
Copy link
Contributor

@etoledom etoledom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS looks good to me.
Tested on WPiOS via wordpress-mobile/WordPress-iOS#11712

@koke koke merged commit 7b2bcea into master May 17, 2019
@koke koke deleted the release/1.5.0 branch May 17, 2019 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@etoledom etoledom etoledom approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.