Skip to content

Conversation

@marecar3
Copy link
Contributor

@marecar3 marecar3 added the Gutenberg Editing and display of Gutenberg blocks. label Feb 14, 2019
@wpmobilebot
Copy link
Contributor

1 Warning
⚠️ PR is not assigned to a milestone.

Generated by 🚫 Danger

Copy link
Contributor

@daniloercoli daniloercoli left a comment

Choose a reason for hiding this comment

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

It seems to me that another PR has collected the changes.
There isn't much to review here.

@marecar3 marecar3 merged commit b87f5f2 into develop Feb 15, 2019
@marecar3 marecar3 deleted the gb/introduce_media_options_sheet branch February 15, 2019 15:56
daniloercoli added a commit that referenced this pull request Feb 18, 2019
…ss-Android into gutenberg/9034-informative-dialog

* 'develop' of https://github.com/wordpress-mobile/WordPress-Android: (23 commits)
  Get site model from the bundle
  Gb/introduce media options sheet (#9251)
  Upgrade Tracks to 1.1.6
  Update the gutenberg-mobile ref to the merged commit
  Minor code styling fix
  Offer in-editor switch to Gutenberg if empty post
  Hide switch to editor button depending on editor and content
  Fix out-dated locale used in new site creation flow
  Avoid pushing the post online when switching editors
  Able to pass edited new post to other editor
  Able to switch editor in new page
  Switch Block to Classic editor for existing pages
  Update metadata strings
  Update release notess for 11.8
  No need for editor warning for pages
  Local id can be non-zero but invalid. Pass a flag too.
  Able to switch editors starting off post list
  CircleCI: Use Orb for caching and storing test results
  Minor refactoring in PostListViewModel
  Able to switch editors
  ...
daniloercoli added a commit that referenced this pull request Feb 19, 2019
…ss-Android into gutenberg/remove-gb-warning-dialog

* 'develop' of https://github.com/wordpress-mobile/WordPress-Android: (63 commits)
  Re-replace private resources with custom ones
  Call reattachUploadingMedia() only for Aztec (#9269)
  Updating signature of function for Android 28
  Bump version to alpha-152/679
  Bump version to alpha-151/677
  Bump version to 11.8-rc-2/678
  Fix merge
  Introduce UNDEFINED_RES_ID and use it instead of the "-1" hard coded value
  Rename variable
  Update release notes
  Use the new specific page adapter for each use case
  Create separate adapters for search and page parent screen
  Rename PagesAdapter to PageListAdapter
  Fix androidTests
  Get site model from the bundle
  Gb/introduce media options sheet (#9251)
  Upgrade Tracks to 1.1.6
  Fix lint ignores for Gutenberg
  Update the gutenberg-mobile ref to the merged commit
  Minor code styling fix
  ...

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java
#	WordPress/src/main/res/values/strings.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Gutenberg Editing and display of Gutenberg blocks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants