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 13.4 into master for translations #10584

Merged
merged 448 commits into from
Oct 10, 2019
Merged

Merge 13.4 into master for translations #10584

merged 448 commits into from
Oct 10, 2019

Conversation

jkmassel
Copy link
Contributor

@jkmassel jkmassel commented Oct 8, 2019

No description provided.

maxme and others added 30 commits August 12, 2019 15:15
@maxme
Remove Visual editor enabling/disabling
b554efa
@maxme
Remove unused layout
6a97546
@maxme
Update example app to use Aztec / Gutenberg
c7baf08
@maxme
Clean up volley exclusions
8a63815
@maxme
Remove last unused listeners
dc69160
@maxme
Merge branch 'develop' into master-auto-upload
1bdae36
@malinajirka
Add missing unit tests for UploadActionUseCase
eacca99
@malinajirka
Fix private post gets published as public
b9707c8
@malinajirka
Update release notes
740bde4
@maxme
First step at checking and restoring unhandled auto save revision
8f9a820
@malinajirka
Add unit test for UploadActionUseCase
e55e444
@maxme
New dialog to restore/don't restore auto saves
27489cf
@maxme
Remove unused PostConflictResolver methods
65455ed
@maxme
Update dialog strings
ad7d320
@maxme
Add new restore autosave and edit functions
195ed6b
@shiki
Merge pull request #10392 from wordpress-mobile/upload-action-use-cas…
83c2bbd 
…e-tests

Add unit tests for UploadActionUseCase
@malinajirka
Add unit tests for PostUtils.prepareForPublish
e8b73ea
@malinajirka
Add unit test for UploadActionUseCase
8b347a2
@malinajirka
Add tracks to UploadStarter
43700bd
@maxme
Merge branch 'develop' into master-auto-upload
6b0e9f2
@maxme
Merge branch 'master-auto-upload' into issue/10108-auto-save-conflict…
a25bd9e 
…-dialog
@maxme
Update with latest FluxC version
78bb46c
@malinajirka
Move PostUtilsUnitTest to the correct package
a97ecd7
@malinajirka
Merge pull request #10402 from wordpress-mobile/issue/10365-fix-priva…
eef2854 
…te-posts

Fix private post gets published as public
@maxme
Fix ktlint errors
2162602
@malinajirka
Add post_status to auto upload tracking event
df2d43d
@shiki
Merge pull request #10423 from wordpress-mobile/add-tracking-to-auto-…
ef4231c 
…upload

Add tracks to UploadStarter
@maxme
Update FluxC hash
063df66
@maxme
Update release notes with unhandled auto-save conflict
84891fe
@maxme
Add an simple test for the auto-save label
b76d408
planarvoid and others added 12 commits October 7, 2019 10:29
@planarvoid
Fix lint issue
202524d
@planarvoid
Remove unused import
f163137
@planarvoid
Merge pull request #10566 from wordpress-mobile/feature/10540_improve…
00acdb8 
…_zendesk_tracks

Improving Zendesk tracked events
@jkmassel
Merge remote-tracking branch 'origin/develop' into merge/13.3-into-de…
beafc3b 
…velop-final

# Conflicts:
#	WordPress/build.gradle
@develric
Merge pull request #10564 from wordpress-mobile/feature/use_gridicons…
6f8938a 
…_in_notifications

Replace noticons with gridicons in Notifications
@develric
Merge pull request #10569 from wordpress-mobile/feature/download_audi…
d196eba 
…o_files_from_reader

Download audio files when clicked
@jkmassel
Merge pull request #10579 from wordpress-mobile/merge/13.3-into-devel…
fc7c4eb 
…op-final

Merge 13.3 into develop
@jkmassel
Bump version number
8a4da8a
@jkmassel
Update release notes.
d48d06b
@jkmassel
Use FluxC 1.5.0
a5d9f51
@jkmassel
Update release notes
73eb6f1
@jkmassel
Update metadata strings
dea2b18
@jkmassel jkmassel added the Releases Label related to managing releases label Oct 8, 2019
@jkmassel jkmassel added this to the 13.4 ❄️ milestone Oct 8, 2019
@jkmassel jkmassel changed the base branch from develop to master October 8, 2019 20:54
@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/login/. It is your responsibility to ensure these changes are merged back into wordpress-mobile/WordPress-Login-Flow-Android. 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/13.4-into-master
  3. git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/WordPress-Android/10584
  4. Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/WordPress-Android/10584 and open a new PR.
📖

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/13.4-into-master
  3. git subtree push --prefix=libs/mocks/ https://github.com/wordpress-mobile/WordPressMocks.git merge/WordPress-Android/10584
  4. Browse to https://github.com/wordpress-mobile/WordPressMocks/pull/new/merge/WordPress-Android/10584 and open a new PR.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Oct 8, 2019 •
edited
Loading

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

@jkmassel jkmassel merged commit a3798ac into master Oct 10, 2019
@jkmassel jkmassel deleted the merge/13.4-into-master branch October 10, 2019 15:30
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

@jtreanor jtreanor Awaiting requested review from jtreanor

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

Successfully merging this pull request may close these issues.