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

Merge 14.0 code freeze into master #11081

Merged
merged 325 commits into from
Jan 15, 2020
Merged

Merge 14.0 code freeze into master #11081

merged 325 commits into from
Jan 15, 2020

Conversation

jkmassel
Copy link
Contributor

Includes code and version number changes from 14.0. Doesn't include release notes.

malinajirka and others added 30 commits December 13, 2019 15:42
@malinajirka
Add tests for featured image support in EditPostSettings
942c81c
@renanferrari
Updating post-signup interstitial illustration to use color references
866c12a
@maxme
Merge pull request #10933 from renanferrari/issue/10923-create-inters…
7e9e35d 
…titial-screen

Post-Signup Interstitial: Create interstitial screen
@jd-alexander
WP Media Picker now announces when an image is selected.
85b64d1
@jd-alexander
Added clear announcement and confirm menu item content description
1e5bee6
@jd-alexander
Removed clear announcement as it clashes with imageview announcement
c0f428b
@jd-alexander
Removed unneeded whitespace and added necessary whiteline
59ca3b7
@jd-alexander
Removed unused imports.
efbabe3
@jd-alexander
Check to see if current content description contains "Image Selected"
e8ff47f
@jd-alexander
marked selected count layout as not important for accessibility
ea18b82
@jd-alexander
Marked selected textview as not important for accessibility.
fa92144
@jd-alexander
Moved behavior to Utils so that it can be replicated in other areas.
fb51d36
@jd-alexander
added annotations to event listener method
e6cf250
@jd-alexander
selection count no longer accessible
e6712e8
@jd-alexander
Moved method to util class that's more appropriate for it's behavior
039b54e
@jd-alexander
Removed clear selected images announcements for consistency
ae130cf
@jd-alexander
Added image selected to content description of PhotoPicker
7338ddc
@jd-alexander
Moved image content description func inline since it's uses differ.
0eb19fa
@jd-alexander
Merge remote-tracking branch 'origin/develop' into issue/10894-aztec-…
0d0664d 
…media-talkback
@jd-alexander
Added image selected on focused to stock/free media picker
71c6f2b
@jd-alexander
Merge remote-tracking branch 'origin/develop' into issue/10895-post-s…
b127cdb 
…ettings-talkback-improvements
@jd-alexander
Added Publish header to group first set of settings.
dd8f9e5
@jd-alexander
Publish header is announced.
23479a6
@jd-alexander
Added a safe way to set accessibility delegates.
30ff588
@jd-alexander
Added accessibility heading
76bcce4
@jd-alexander
Remove cleared selected images.
af2adf8
@jd-alexander
Disabled content description on menu items as it needs min sdk 26
225a111
@jd-alexander
Removed unused import.
7c2f3b6
@planarvoid
Merge two updatePostObject methods into one
b310ba3
@maxme
Push current branch only, don't rely on local git config
a6d0f42
develric and others added 21 commits January 12, 2020 03:46
@develric
Fixing issue with shared pref saved main page index if upgrading to t…
3532bfc 
…his version from previous one.
@develric
Removing Feature Flag from relevant code after merge from develop.
332a96f
@develric
Updating release notes.
f6c3694
@develric
Fix bug to avoid showing the FAB if user has no sites.
3d1836a
@develric
Removing unused files.
250dc5c
@develric
Fixing lint.
201cc39
@develric
Fixing connected tests.
2d8b720
@malinajirka
Merge pull request #11064 from wordpress-mobile/issue/11013-ia-bottom…
c7ed85b 
…-sheet-post-vs-page

IA create content bottom sheet changes
@malinajirka
Merge pull request #11069 from wordpress-mobile/fix/ia-bottom-sheet-l…
fb80865 
…andscape

Main fab bottom sheet expanded in landscape
@develric
Merge branch 'develop' into feature/ia-me-move-create-fab-v1
e9fe092
@malinajirka
Merge pull request #11075 from wordpress-mobile/issue/11013-ia-bottom…
e58e3cf 
…-sheet-post-vs-page

Merge #11069 PR into develop.
@develric
Merge pull request #11074 from wordpress-mobile/feature/ia-me-move-cr…
c9578a0 
…eate-fab-v1

IA Feature Flag remove for me move and create fab v1
@maxme @jkmassel
Bump FluxC to version 1.5.7
3307368
@maxme @oguzkocer @jkmassel
Bump FluxC to version 1.5.8
f062aa4 
Co-Authored-By: Oguz Kocer <[email protected]>
@jkmassel
Updates translations
e13c82f
@jkmassel
Bump version number
66c0ca5
@jkmassel
Update metadata translations for 13.9
808bae3
@mchowning
Merge pull request #11060 from wordpress-mobile/issue/1714_pass_false…
78cfb88 
…_for_aztec_instead_of_null

Set gutenbergEnabled to false if all sites use Aztec
@jkmassel
Merge pull request #11079 from wordpress-mobile/merge/13.9-into-develop
683b002 
Merge 13.9 into develop
@jkmassel
Bump version number
2a54a2f
@jkmassel
Update release notes.
afd4eeb
@jkmassel jkmassel added the Releases Label related to managing releases label Jan 14, 2020
@jkmassel jkmassel added this to the 14.0 ❄️ milestone Jan 14, 2020
@jkmassel jkmassel requested a review from loremattei January 14, 2020 05:24
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.
Messages
📖

This PR contains changes in the subtree libs/mocks/. It is your responsibility to ensure these changes are merged back into wordpress-mobile/WordPressMocks. Follow these handy steps!
WARNING: Make sure your git version is 2.19.x or lower - there is currently a bug in later versions that will corrupt the subtree history!

  1. cd WordPress-Android
  2. git checkout merge/14.0-into-master
  3. git subtree push --prefix=libs/mocks/ https://github.com/wordpress-mobile/WordPressMocks.git merge/WordPress-Android/11081
  4. Browse to https://github.com/wordpress-mobile/WordPressMocks/pull/new/merge/WordPress-Android/11081 and open a new PR.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

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

@jkmassel jkmassel merged commit 370c33e into master Jan 15, 2020
@jkmassel jkmassel deleted the merge/14.0-into-master branch January 15, 2020 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@loremattei loremattei loremattei approved these changes

Assignees
No one assigned
Labels
Releases Label related to managing releases
Projects
None yet
Milestone
14.0
Development

Successfully merging this pull request may close these issues.