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

Master to develop post release v1.20.0 #1770

Merged
merged 40 commits into from
Jan 14, 2020
Merged

Master to develop post release v1.20.0 #1770

merged 40 commits into from
Jan 14, 2020

Conversation

Tug
Copy link
Contributor

@Tug Tug commented Jan 10, 2020

Bringing updates from release v1.20.0 back into develop. Gutenberg reference updated to latest release commit on master branch.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

Tug and others added 30 commits November 28, 2019 15:37
@Tug
Let's not escape strings in android strings.xml with double quotes as…
d3fab35 
… it is not supported by GlotPress
@Tug
Add back line break
6013ce1
@Tug
Merge remote-tracking branch 'origin/develop' into update/simplify-an…
b1bf800 
…droid-strings-xml
@Tug
Merge remote-tracking branch 'origin/develop' into update/simplify-an…
682a10c 
…droid-strings-xml
@Tug
Merge remote-tracking branch 'origin/develop' into update/simplify-an…
9af1651 
…droid-strings-xml
@planarvoid
Update Aztec version to contain the content watcher
bfcd739
@planarvoid
Increase gutenberg version
ff2669c
@Tug
Merge remote-tracking branch 'origin/develop' into update/simplify-an…
b406e72 
…droid-strings-xml
@Tug
Merge remote-tracking branch 'origin/develop' into update/simplify-an…
60fee91 
…droid-strings-xml
@planarvoid
Target aztec release
da41861
@Tug
Update package.json and JS bundle for 1.20.0 release
e6cfebc
@lukewalczak
Fixes after navigation for release 1.20.0 (#1754)
63576ba 
* Add ref to gutenberg repo

* Update ref to gutenberg release branch
@dratwas
[FIX] Rich Text loop when autocompleting text on iOS (#1702)
4163a5e 
* fix iOS focus loop

* update ref

* some styling fix

* update ref

* back the TextInputState

* update ref

* revert changes

* remove  unused variable

* update ref

* update ref

* remove register and unregister of text input

* update ref
@Tug
Update release notes
3c3d7b3
@Tug
Update bundles
006154a
@lukewalczak
Correct displaying photo during upload (#1758)
5a3cbc7 
* Add ref to gutenberg release

* Update ref to gutenberg release branch
@Tug
Merge remote-tracking branch 'origin/release/1.20.0' into update/simp…
35b7fce 
…lify-android-strings-xml
@Tug
Revert changes on bundle/
cea513c
@Tug
Merge pull request #1637 from wordpress-mobile/update/simplify-androi…
1aa50ea 
…d-strings-xml

Do no escape strings with double quotes in android strings.xml
@Tug
Update bundles
cfab4cd
@malinajirka
Merge pull request #1710 from wordpress-mobile/feature/add_content_wa…
3ee93dd 
…tcher_to_aztec

Release v1.19.1
@Tug
Merge remote-tracking branch 'origin/master' into release/1.20.0
af49400
@Tug
Update bundles
184d0eb
@hypest
Revert "Upgrade the Video lib to fix #1705"
9114524 
This reverts commit 4085aeb.
@hypest
Revert "Revert "Upgrade the Video lib to fix #1705""
3863c86 
This reverts commit 9114524.
@hypest
Bump the react-native-video hash
162a462
@lukewalczak @dratwas
Fix crash once adding a Group block (#1755)
5b727a7 
Co-authored-by: Drapich Piotr <[email protected]>
@hypest
Bump the react-native-video hash
39f9f34
@hypest
Merge pull request #1768 from wordpress-mobile/issue/1761-video-overf…
706b981 
…low-on-android

Force the react-native-video fork to build against same RN version as gutenberg-mobile from maven repo
@Tug
Update sourcemaps in bundle (no code change it seems)
feb339e
@Tug Tug requested a review from hypest January 10, 2020 18:22
@Tug Tug self-assigned this Jan 10, 2020
mchowning
mchowning approved these changes Jan 14, 2020
View reviewed changes
Copy link
Contributor

@mchowning mchowning left a comment

Choose a reason for hiding this comment

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

Looks good and I don't see any problems when running the app. 👍

@Tug Tug merged commit 49f605f into develop Jan 14, 2020
@Tug Tug deleted the master-to-develop-post-release-v1.20.0 branch January 14, 2020 17:40
@cameronvoell cameronvoell mentioned this pull request Jan 14, 2020
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mchowning mchowning mchowning approved these changes

@hypest hypest Awaiting requested review from hypest

Assignees

@Tug Tug

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Tug @mchowning @planarvoid @lukewalczak @dratwas @malinajirka @hypest @koke