Skip to content

[Monorepo] Master PR #18508

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
Merged
Tug merged 5,360 commits into from
Jan 6, 2020
Merged

[Monorepo] Master PR #18508

Tug merged 5,360 commits into from
Jan 6, 2020

Conversation

@dratwas
Copy link
Contributor

@dratwas dratwas commented Nov 14, 2019 •
edited by ceyhun
Loading

Explores #11491.
Superseeds #17456 started by @Tug

This is a migration of gutenberg-mobile to gutenberg repository with git history.

How has this been tested?

At this stage, there is nothing to test.

list of all related PRs:

@dratwas dratwas added [Status] In Progress Tracking issues with work in progress [Type] Technical Prototype Offers a technical exploration into an idea as an example of what's possible labels Nov 14, 2019
Tug and others added 11 commits November 18, 2019 17:24
@Tug
Merge remote-tracking branch 'origin/develop' into master_develop_1.1…
443fba9 
…7_merge
@Tug
Use string-array instead of plurals tag in strings.xml
9eda75a 
See https://github.com/GlotPress/GlotPress-WP/blob/master/gp-includes/formats/format-android.php
@Tug
Update string files
ce59499
@Tug
Update scripts to minimize changes in git diff and keep the same cont…
5c88646 
…ext for android
@Tug
Exclude strings from tests
8210c59
@Tug
Fix lint errors
033f055
@Tug
Bump version to 1.17.1
afbf2a9
@mchowning
Update gutenberg ref following 1.17 merge to gutenberg master
89c27cc
@mchowning
Merge pull request #1584 from wordpress-mobile/master_develop_1.17_merge
85f759c 
Master -> Develop (1.17)
@etoledom
Update gutenberg ref
e44264c
@etoledom
Merge remote-tracking branch 'origin/develop' into try/image-size-net…
9183a39 
…working-native
@Tug Tug self-requested a review November 19, 2019 10:08
@dratwas dratwas removed the [Status] In Progress Tracking issues with work in progress label Nov 20, 2019
@dratwas dratwas marked this pull request as ready for review November 20, 2019 09:43
@dratwas dratwas changed the base branch from master to feat/import-gutenberg-mobile November 20, 2019 10:27
Gerardo Pacheco added 2 commits December 26, 2019 14:55
Update Gutenberg ref
f6c122c
Merge pull request #1701 from wordpress-mobile/fix-undo-crash
86ceb4e 
Fix app crash after block removal due to `undo` button pressing
@Tug
Copy link
Contributor

Tug commented Jan 6, 2020 •
edited
Loading

@dratwas although it's ok to not be 100% in sync with gutenberg-mobile (this is a branch experiment, and we can always merge in the latest change progressively), it's true that we haven't updated it for a while, updating now.

Edit: this is the git command I ran for reference: git subtree pull --prefix packages/react-native-editor/ [email protected]:wordpress-mobile/gutenberg-mobile.git develop

@maxme maxme self-requested a review January 6, 2020 14:34
maxme
maxme approved these changes Jan 6, 2020
View reviewed changes
Copy link
Contributor

@maxme maxme left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Obviously I haven't reviewed the code, but I checked the commit history looked like what we have in gutenberg-mobile and I also checked the changes were contained in packages/react-native-editor/

These changes are contained in packages/react-native-editor/ only:

$ git diff --name-only feat/import-gutenberg-mobile...rnmobile/import-mobile | cut -d "/" -f1-2 | uniq
packages/react-native-editor

Commit history looks like the same in this PR and in the gutenberg-mobile repo.

$ cd gutenberg-mobile
$ git shortlog -s

and

$ git shortlog -s feat/import-gutenberg-mobile...rnmobile/import-mobile

gives almost the same results.

Note: I'm not sure how relevant some of the dotfiles are in there, but seems like we don't want to complexify this by filtering them out yet.

@Tug Tug merged commit 26ee90d into feat/import-gutenberg-mobile Jan 6, 2020
@Tug Tug deleted the rnmobile/import-mobile branch January 16, 2020 14:51
Tug added a commit that referenced this pull request Jan 16, 2020
@dratwas @Tug
@mchowning @etoledom @SergioEstevao @cameronvoell @koke @JavonDavis @maxme @mkevins @hypest @marecar3 @lukewalczak @pinarol @designsimply @jbinda @ockham
[Monorepo][base-branch] import of gutenberg-mobile (#18508)
4cbda37 
* Use string-array instead of plurals tag in strings.xml

See https://github.com/GlotPress/GlotPress-WP/blob/master/gp-includes/formats/format-android.php

* Update string files

* Update scripts to minimize changes in git diff and keep the same context for android

* Exclude strings from tests

* Fix lint errors

* Bump version to 1.17.1

* Update gutenberg ref following 1.17 merge to gutenberg master

* Update gutenberg ref

* Remove declaration on bridge of unused methods.

* Added bridge code for gutenberg to request a native fullscreen preview for for an image from a URL on iOS.

* Updating bundle and gutenberg reference.

* Updated release notes.

* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg ref

* Update GB reference.

* Updating bundle after catching up branch and gutenberg submodule.

* Update gutenberg ref

* Update release notes.

* Update UI test

* Pass postType as initial prop on iOS

* Pass postType down to Editor

* Allow Android to set the post type

* Updating gutenberg reference.

* Removed duplicate line from merge.

* updafe test files and iOS version for running locally with xcode 11

* Update gutenberg ref

* Update gutenberg ref

* Update aztec to version that support reversed and start on lists.

* Update Gutenberg to version where list settings are active in native.

* update block list check and capabilities

* replace double click on android

* fix block insertion timeout

* update branch with develop

* Update gutenberg ref

* Update package.json and JS bundle for 1.18.0 release

* Update Gutenberg

* Update Gutenberg

* update gutenberg ref

* Update GB-reference.

* Update release notes.

* revert caps to iPhone Simulator

* Update Gutenberg ref

* Update Release notes

* Update gutenberg/ reference

* Update bundles

* Update GB reference.

* Fix spacing

* Add static method to Media class to create instance using mimeType

* Add flag to track when appending multiple selected media items as blocks

* Introduce mediaSelectionCancelled method in WPAndroidGlueCode

* Set flag to append blocks when multiple = false is not respected

* Only use appendUploadMediaFiles plural version

* Update gutenberg ref

* Update to latest Gutenberg master

* Patch jsdom to implement Element.closest()

* Bring back changes on package.json from 1.7.1

* Add docstring to the function

* Return null as per https://dom.spec.whatwg.org/#dom-element-closest

* Update Aztec version.

* Update GB reference.

* Update gutenberg ref

* Update RELEASE-NOTES.txt

* Update GB reference

* Improve code block style

* Update GB reference.

* Update gutenberg ref

* Update Media mimeType truncation to use enum names

* Add Javadoc for mAppendsMultipleSelectedToSiblingBlocks flag

* Set appends to sibling blocks flag explicitly for all requests

* Add clarifying comment for special block append handling

* Remove singular (unused) appendMedia method

* Update GB reference.

* Update GB reference to master.

* Set appends to sibling blocks flag explicitly for other media pick

* Update GB reference.

* Update GB reference.

* Use lowercase for Media mimeType truncation

* Update Gutenberg

* Update Gutenberg

* Update Gutenberg ref - after fix for caption alignment

* Update bundles

* Point to aztecVersion hash which supports list with start and reverse attribute

* Update bundle and gutenberg ref - fix disappearing image

* Update GB reference.

* Update GB reference.

* Update GB reference.

* Update Gutenberg

* Update Gutenberg ref

* Update GB reference

* Update GB reference.

* Only enable page templates on dev builds

* Update aztec version

* Update aztec version

* Add colors for gallery block

* Update gutenberg reference

* Update gutenberg reference

* Update gutenberg reference

* Update GB reference.

* Update Gutenberg ref

* Update Aztec version to 1.14.0

* Make sure if the textColor is changed the default text color is updated.

* Use Slider from react-native-community lib (#1620)

* Use Slider from react-native-community lib

* Update slider version

* Add function to read npm version

* Rengenerate yarn.lock

* Bump node version

* Update readNPMVersion function

* Use Slider from fork

* Update Slider commit

* Use Slider from wordpress-mobile fork

* Add react-native-slider podspec

* Improve babel config

* Correct settings.gradle

* Correct project.pbxproj

* Update ref

* Bump

* Update ref

* Update ref to gutenberg master

* Update ref to gutenberg quick fix

* Update ref to gutenberg master

* Update Aztec editor version.

* Update to iOS 13

* Update Xcode version.

* Use iOS 12 for tests.

* Fix typo

* Update Aztec to fix CI error with xcode 10

* Use iOS 12.2

* Update Appium version.

* Update to appium 1.15.1

* Update to Appium 1.15.1 only in iOS

* Update caps.

* Add Gallery Block (#1498)

* WIP - initial-html.js for gallery testing

* Add parent app media mock for Android

* Update gutenberg reference

* Update gutenberg reference

* Comment out line setting mPendingMediaUploadCallback to null

* Update gutenberg reference

* Generate bundles

* Update gutenberg ref

* Generate bundles

* Generate bundles

* Add some color-studio colors for gallery

* Update gutenberg reference

* Generate bundle

* WIP update ref

* Update gutenberg reference

* Update gutenberg submodule

* Generate bundles

* Add $gray-40 color

* Update gutenberg reference

* Generate bundles

* Update gutenberg reference

* Generate bundles

* Update gutenberg reference

* Generate bundles

* Update gutenberg reference

* Generate bundles

* Update gutenberg reference

* Update gutenberg reference

* Update gutenberg reference

* Update gutenberg reference

* Update gutenberg reference

* Update gutenberg reference

* Update gutenberg reference

* Update gutenberg reference

* Restore demo content

* Restore anonymous implementation of GutenbergBridgeJS2Parent

* Update gutenberg reference

* Generate bundles

* Bump up Aztec version on iOS Example app

* Update gb ref

* Generate bundles

* Update gutenberg ref

* Update gutenberg ref (#1646)

* Add release notes for Gallery (#1658)

* Make sure we use iPhone 11 (iOS 13) for build and run tests

* Pooint aztecVersion to develop

* Update Appium for Android tests too.

* Set Appium to 1.15.0

* Update aztec version to 1.3.36

* Update appium to 1.16.0-rc.1

* Update Aztec iOS to 1.14.1

* Update GB reference.

* Activate preformat block on android platform (#1615)

* Updates package.json and JS bundle for 1.19.0 release.

* Update to shorten git commands

Make the git commands a little easier to copy by taking out `$` from the start of the lines.

This also matches with the other commands on the page which do not start with `$`.

* Update Unit Tests headings in Getting Started documentation

The heading "Test" should be "Unit Tests".

The heading "Writing and Running Tests" should be "Writing and Running Unit Tests".

https://github.com/wordpress-mobile/gutenberg-mobile/blob/develop/src/index.test.js

* Update gutenberg reference

* Update gutenberg reference

* Update gutenberg ref

* Updating bundles.

* Feat: Navigation Down in InnerBlocks (#1379)

* Add ref to gutenberg repo

* Fix e2e tests

* Update ref to gutenberg master

* Update Gutenberg ref

* Remove empty line between checkboxes

* Updating release notes to show video settings in 1.19

* Updating gutenberg reference to latest 1.19 release change on gutenberg master branch

* Update gutenberg ref

* Sass Transformer: Also look for partials

Add support for [SASS partials](https://sass-lang.com/guide), as is already present [upstream](https://github.com/kristerkari/react-native-sass-transformer/blob/52884dd59582856fa17e2b2e8ca9efc37d412387/index.js#L41-L42).

This should fix the issue introduced by #19159, and discussed there.

* Single quotes

* Also update sass-transformer-inside-gb.js

* Update release notes

* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg ref

* Update Gutenberg ref

* Update gutenberg ref

* Update gutenberg ref

* Bundles up to date with merged code from develop

* Add ref to gutenberg repo

* Update ref

* Update ref

* Update ref

* Upgrade the SVG lib to fix #1703

* Upgrade the Video lib to fix #1705

* Upgrade the Slider lib to use node_modules in local npm build

* Update ref

* Upgrade the SVG lib ref

* Upgrade the Video lib ref

* Upgrade the Slider lib ref

* Update ref

* Brings back gb master to normal (#1722)

* Fix/Bring back master to normal (#1724)

* Update Gutenberg ref

* Update Gutenberg ref

Co-authored-by: Tugdual de Kerviler <[email protected]>
Co-authored-by: Matt Chowning <[email protected]>
Co-authored-by: etoledom <[email protected]>
Co-authored-by: Sérgio Estêvão <[email protected]>
Co-authored-by: Cameron Voell <[email protected]>
Co-authored-by: Jorge Bernal <[email protected]>
Co-authored-by: Javon Davis <[email protected]>
Co-authored-by: Maxime Biais <[email protected]>
Co-authored-by: Gerardo Pacheco <[email protected]>
Co-authored-by: Matthew Kevins <[email protected]>
Co-authored-by: Stefanos Togoulidis <[email protected]>
Co-authored-by: Marko Savic <[email protected]>
Co-authored-by: Luke Walczak <[email protected]>
Co-authored-by: Pinar Olguc <[email protected]>
Co-authored-by: Sheri Bigelow <[email protected]>
Co-authored-by: jbinda <[email protected]>
Co-authored-by: Bernie Reiter <[email protected]>
@Tug Tug mentioned this pull request Jan 16, 2020
Merged
@ellatrix ellatrix added this to the Gutenberg 7.3 milestone Jan 20, 2020
@dratwas dratwas mentioned this pull request Jan 21, 2020
Merged
6 tasks
This was referenced Jan 24, 2020
Closed
Closed
@Tug Tug added the Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change) label Mar 24, 2020
@Tug Tug self-assigned this Mar 24, 2020
@Tug Tug requested review from cameronvoell and ceyhun March 24, 2020 10:41
@ceyhun ceyhun mentioned this pull request Apr 2, 2020
Merged
6 tasks
This was referenced Apr 10, 2020
Merged
Merged
@ceyhun ceyhun mentioned this pull request Apr 15, 2020
Merged
6 tasks
@cameronvoell cameronvoell mentioned this pull request Apr 30, 2020
Merged
6 tasks
@ceyhun ceyhun mentioned this pull request May 4, 2020
Merged
6 tasks
@Tug Tug mentioned this pull request May 7, 2020
Closed
8 tasks
@ceyhun ceyhun mentioned this pull request May 13, 2020
Merged
6 tasks
@Tug Tug changed the title [Monorepo][base-branch] import of gutenberg-mobile [Monorepo] Master PR May 28, 2020
@Tug Tug mentioned this pull request Jun 5, 2020
Merged
6 tasks
@ceyhun ceyhun mentioned this pull request Jun 17, 2020
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Tug Tug Tug approved these changes

@cameronvoell cameronvoell Awaiting requested review from cameronvoell

@ceyhun ceyhun Awaiting requested review from ceyhun

+1 more reviewer

@maxme maxme maxme approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@Tug Tug

Labels

Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change) [Type] Technical Prototype Offers a technical exploration into an idea as an example of what's possible

Projects

None yet

Milestone

Gutenberg 7.3

Development

Successfully merging this pull request may close these issues.