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

Merge 13.3 into master #10539

Merged
merged 208 commits into from
Sep 29, 2019
Merged

Merge 13.3 into master #10539

merged 208 commits into from
Sep 29, 2019

Conversation

jkmassel
Copy link
Contributor

Merges changes from 13.3 into master. Includes already-approved changes, and updated release notes.

jtreanor and others added 30 commits July 31, 2019 17:33
…ds since those are not used anymore in the app.

It was used in a test, but the app ignore it, so not sure why the tests is not failing. Maybe we're not running it ;)
…ss-Android into fix/make.sure-the-opt-in-dialog-is-shown-once

* 'develop' of https://github.com/wordpress-mobile/WordPress-Android: (138 commits)
  Update aztec to v1.3.29 (#10334) and gb-mobile to v.1.10.1
  Squashed 'libs/login/' changes from 250f32d48c..8b6384cb59
  Fix a NPE in offline mode
  Fixe lint error
  Use maximum value only on bigger screens
  Set maximum alert dialog width from dimensions
  Fixed alert width on regular devices
  Fixed typo.
  Fixed failed tests
  Fixe alert window size on Chromebooks and Tablets
  Release notes.
  Squashed 'libs/login/' changes from fc60b518d7..250f32d48c
  Squashed 'libs/login/' changes from 69e488759c..fc60b518d7
  Squashed 'libs/login/' changes from 5a21797a03..69e488759c
  Setting light toolbar.
  Use 1.2.0-beta-1
  Updated refresh button color.
  Optimize AppLog
  Fix simple date format concurrency issue
  Do not show publish confirmation dialog on submit for review
  ...

# Conflicts:
#	build.gradle
maxme and others added 24 commits September 9, 2019 09:35
…rname

Fixes #8002: Add ability to change username
…t_type_to_posts_and_pages

Add Other post type to posts and pages
5355152735 Merge pull request #8 from wordpress-mobile/add/sites-gutenberg-mock
5a6744aad2 Update WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_158396482_gutenberg.json
e3c87e4198 add gutenberg mock file
1a7476762a Merge pull request #7 from wordpress-mobile/add/wpios-signup-mocks
745b5c6cc0 Fix regex pattern for me endpoint mocks
2b1d7643c8 Fix regex for endpoints used in signup test
d0faae1206 Fix mocks for sending signup email
10c58741ba Update mocks for WPiOS signup test

git-subtree-dir: libs/mocks
git-subtree-split: 5355152735dd323b8e4aef2cfb21efe056a15f5f
…ss-Android into fix/10415-Local-auto-save-doesnt-work-in-Gutenberg

* 'develop' of https://github.com/wordpress-mobile/WordPress-Android: (81 commits)
  Update gutenberg-mobile ref to v1.12.0 release
  Update FluxC to the tagged version
  Update FluxC version to 1.4.0-beta-1
  Update release notes from gutenberg-mobile 1.12.0 release
  Update metadata translations for 13.2
  Bump version number
  Updates translations
  revert IDE change to Project.xml
  revert IDE change to Project.xml
  Hide Sharing manage options for non-admins
  Removed unused attribute.
  Add Other post type to posts and pages
  Show an empty screen when all insights are removed
  Fix release notes
  Logic fixes based on the PR feedback
  Address PR comments
  fix small lint errors
  Removed exit transition and ActivityCompat call.
  Removed slide from left animation.
  use viewinteraction for choosing options menu
  ...

# Conflicts:
#	libs/gutenberg-mobile
…save-doesnt-work-in-Gutenberg

Fix for local auto save that  doesn't work in Gutenberg
…ase_note

Add release notes for local autosave from #10483
@jkmassel jkmassel added the Releases Label related to managing releases label Sep 29, 2019
@jkmassel jkmassel self-assigned this Sep 29, 2019
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR is not assigned to a milestone.
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

You can test the changes on this Pull Request by downloading the APK here.

@jkmassel
Copy link
Contributor Author

Admin-merging for release notes.

/cc @loremattei

@jkmassel jkmassel merged commit edde1fb into master Sep 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Label related to managing releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.