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.7 into master #10814

Merged
merged 156 commits into from
Nov 20, 2019
Merged

Merge 13.7 into master #10814

merged 156 commits into from
Nov 20, 2019

Conversation

jkmassel
Copy link
Contributor

13.7 Code Freeze:

  • Merges lots of code changes
  • Increments build numbers
  • Updates FluxC

Does not yet include final release notes – those will come as a separate PR

planarvoid and others added 30 commits October 22, 2019 14:01
@planarvoid
Extract push IDs
6b35195
@planarvoid
Add Delete intent to all the notification builderes
840cddf
@planarvoid
Convert NotificationPushId to enum
742f7b7
@planarvoid
Create notifications tracker
5b80bab
@planarvoid
Use SystemNotificationTracker
c121ee3
@planarvoid
Add tests
7c3613e
@planarvoid
Fixes
f9b4808
@planarvoid
Revert projects.xml change
01e8b37
@planarvoid
Add tracking for shown and tapped notification
996a643
@planarvoid
Fix crash
f82a2f3
@planarvoid
Remove test logs
fcacbe5
@planarvoid
Add missing newline
27ffcb7
@planarvoid
Merge branch 'feature/add_dismiss_tracking_to_notifications' into fea…
de91e04 
…ture/add_tap_tracking_to_notifications
@cameronvoell
Updating gutenberg-mobile reference for fullscreen preview branch
8039bb1
@cameronvoell
Adding OnImageFullscreenPreviewListener to GB Fragment for listening …
63b6c53 
…for image preview requests from gb-editor
@cameronvoell
EditPostActivity implements EditorImagePreviewListener in order to ro…
0358274 
…ute image preview requests from GB editor to MediaPreviewActivity.
@hafizrahman
Rename suffixes to use the US/Canada/Modern British version instead o…
e49c088 
…f SI.
added utility function for encrypting AppLog using libsodium
092a91d
* using UTF-8 encoding when converting String to bytes
28b5eca 
* using NO_WRAP flag when encoding to base64
now base64 decoding the public key before using
02f9e70 
made base64 encode/decode flags a bit easier to set
added a new line to the log line after we split the lines in the AppLog
735f6ff 
cleaned up some of the code
fixed some style issues
34fc367
fixed an issue with not using the correct byte array length when encr…
7fba3e4 
…ypting log lines

removed reference to an exception that is no longer used
cleaned up some comments
7334b74
fixed style issue
92d6557
@jkmassel
Merge pull request #10729 from wordpress-mobile/merge/13.6-into-develop
9b930a8 
Merge 13.6 code freeze into develop
@planarvoid
Merge branch 'develop' into feature/add_dismiss_tracking_to_notificat…
5c463a6 
…ions
@develric
Merge pull request #10667 from wordpress-mobile/feature/add_dismiss_t…
23aa14c 
…racking_to_notifications

Add dismiss tracking to system notifications
@planarvoid
Merge branch 'develop' into feature/add_tap_tracking_to_notifications
0fb273f
@develric
Merge pull request #10679 from wordpress-mobile/feature/add_tap_track…
bc953fb 
…ing_to_notifications

Add tap and shown tracking to notifications
shiki and others added 21 commits November 14, 2019 14:57
@shiki
Merge pull request #10741 from wordpress-mobile/issue/10734-accessibi…
3f99349 
…lity-reader-filters

Accessibility : Reader Improvements
@khaykov
Catching IllegalStateException.
0ce957c
gave descriptive names to some variables in EncryptionUtils and Encry…
a57da8f 
…ptionUtilsTest
@maxme
Merge pull request #10752 from wordpress-mobile/issue/10747-gutenberg…
a8b1a63 
…-progressive-rollout

Gutenberg progressive rollout
@hypest
Update gutenberg-mobile hash
e0ded2a
@maxme
Bump Gutenberg progressive rollout from 5 to 10%
079019d
@Tug
Revert "Revert changes to WordPress/src/main/res/values/strings.xml"
2fc6134 
This reverts commit cfeaea6.
@Tug
Merge remote-tracking branch 'origin/gutenberg/release-1.17.0' into g…
9ecc087 
…utenberg/fix-i18n
@Tug
Merge pull request #10719 from wordpress-mobile/gutenberg/fix-i18n
c6d80f1 
Automate updating gutenberg translations
@hypest
Merge pull request #10804 from wordpress-mobile/issue/bump-gb-rollout…
0ef5a51 
…-from-5-to-10-percent

Bump Gutenberg progressive rollout from 5 to 10%
@marecar3
[Gutenberg] hotfix crash which occurs after deleting image or page br…
58a1d52 
…eak block (#10805)
@khaykov
Added Crash logging for referrer exception.
116eab6
@Tug
Revert "Merge pull request #10719 from wordpress-mobile/gutenberg/fix…
669110e 
…-i18n"

This reverts commit c6d80f1, reversing
changes made to e0ded2a.
@mchowning
Update gutenberg ref
e01d64d
@mchowning
Merge pull request #10769 from wordpress-mobile/gutenberg/release-1.17.0
145a94f 
Gutenberg: Update to v1.17.0
@jkmassel
Merge pull request #10738 from ravenstewart/issue/10698-implement-enc…
bf646d3 
…rypted-logging

Add Encryption Functionality and Tests
@malinajirka
Merge pull request #10803 from wordpress-mobile/issue/9985-catch-Ille…
0d5284e 
…galStateException-in-InstallReferrerClient

issue/9985 catching IllegalStateException.
@jkmassel
Merge pull request #10808 from wordpress-mobile/merge/13.6-into-develop
b8e888e 
Merge 13.6 into develop
@jkmassel
Bump version number
fe1b811
@jkmassel
Update release notes.
192dc1d
@jkmassel
Update FluxC
0f42a3c
@jkmassel jkmassel added the Releases Label related to managing releases label Nov 19, 2019
@jkmassel jkmassel added this to the 13.7 ❄️ milestone Nov 19, 2019
@jkmassel jkmassel requested a review from loremattei November 19, 2019 05:38
@jkmassel jkmassel self-assigned this Nov 19, 2019
@peril-wordpress-mobile
Copy link

Warnings
⚠️ 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 jkmassel merged commit cc9d796 into master Nov 20, 2019
@jkmassel jkmassel deleted the merge/13.7-into-master branch November 20, 2019 19:34
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

@jkmassel jkmassel

Labels
Releases Label related to managing releases
Projects
None yet
Milestone
13.7
Development

Successfully merging this pull request may close these issues.