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 15.1 code freeze to master #12203

Merged
merged 988 commits into from
Jun 16, 2020
Merged

Merge 15.1 code freeze to master #12203

merged 988 commits into from
Jun 16, 2020

Conversation

oguzkocer
Copy link
Contributor

No description provided.

planarvoid and others added 30 commits June 9, 2020 10:06
@planarvoid
Use boolean flag to determine whether there is a custom empty view
ca78990
@malinajirka
Use synthetic accessors in NotificationsListFragment
abad897
@planarvoid
End progress when the login fragment is destroyed
6f5f350
@malinajirka
Remove unnecessary null checks in NotificationsListFragment
8dc282b
@malinajirka
Make accountStore non-nullable
1195758
@planarvoid
Clear site settings when fragments are destroyed
c6cd519
@malinajirka
Clean-up after automatic java2kotlin converter
82d2a2a
@planarvoid
Remove reference to notes adapter (which could survive the view being…
1685e97 
… destroyed)
@planarvoid
Fix checkstyle issue
e6b9b02
@planarvoid
Convert MySiteFragment.java to MySiteFragment.kt
1f50b8f
@malinajirka
Move view setup to onViewCreated
6b0ac6b
@malinajirka
Fix maxlinelength lint issue
923af90
@planarvoid
Convert injected fields to lateinit vars
5945d0c
@planarvoid
Remove import of R values
2d68339
@planarvoid
Clean up onClick listeners and require methods
7168210
@planarvoid
End file with newline
996b300
@planarvoid
Use synthetic accessor for blavatar image view
9df2b02
@planarvoid
Use synthetic accessor for avatar image view
66bbdd1
@planarvoid
Use synthetic accessor for blavatar progress bar view
d845e96
@planarvoid
Use synthetic accessor for blog title text view
f7d6e5a
@planarvoid
Use synthetic accessor for blog subtitle text view
eefdf0e
@planarvoid
Use synthetic accessor for look and feel header view
0c701d9
@planarvoid
Use synthetic accessor for themes container view
65ed56f
@planarvoid
Use synthetic accessor for people view
2e4b725
@planarvoid
Use synthetic accessor for page view
11d6855
@planarvoid
Use synthetic accessor for wuick action page button container view
6b4145a
@planarvoid
Use synthetic accessor for quick action buttons container view
2ecc23e
@planarvoid
Use synthetic accessor for plan container view
07872b4
@planarvoid
Use synthetic accessor for plugins container view
3ebd033
@planarvoid
Use synthetic accessor for activity log container view
a07b85c
oguzkocer and others added 22 commits June 12, 2020 20:04
@oguzkocer
Fixes ZendeskPlanFieldHelperTest's crash logging usage
0600dad
@mzorz
make sure to inject AuthenticationUtils in AztecVideoLoader
2ec2e83
@mzorz
bumped utils to 1.25, needed for passing new auth headers in getVideo…
b100d6c 
…FrameFromVideo signature
@mzorz
Merge branch 'develop' into issue/12025-media-preview-private-sites
b579192
@oguzkocer
Merge pull request #12178 from wordpress-mobile/issue/12025-media-pre…
8e55b05 
…view-private-sites

Media Browser: fix media preview for private sites
@jd-alexander
created light and dark colors for home ui
b0d9421
@jd-alexander
updated disabled night color.
733430c
@ashiagr
Merge branch 'develop' into issue/12026_ri_choose_interests_loading_s…
4c32dde 
…tate

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModel.kt
#	WordPress/src/test/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModelTest.kt
@ashiagr
Fix merge issue
cd1c6a8
@malinajirka
Merge branch 'develop' into fix/convert-me-fragment-to-kotlin
9630883 
# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
@malinajirka
Fix lint issues
e9a4bd7
@ashiagr
Use new ui states in the fragment
4713df6
@ashiagr
Refactor tests to have a single purpose
5685ceb
@malinajirka
Merge pull request #12152 from wordpress-mobile/fix/convert-me-fragme…
4bd5984 
…nt-to-kotlin

Convert me fragment to kotlin
@ashiagr
Merge pull request #12194 from wordpress-mobile/issue-12193/fix_dark_…
becea7b 
…mode_issue

Prepublishing Nudges : Dark mode issue
@ashiagr
Fix formatting
211b289
@malinajirka
Merge pull request #12113 from wordpress-mobile/issue/12026_ri_choose…
e485636 
…_interests_loading_state

RI:  Choose Interests - Introduce loading state
@jkmassel
Merge remote-tracking branch 'origin/develop' into add/sentry-user-data
387980c 
# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@oguzkocer
Merge pull request #12155 from wordpress-mobile/add/sentry-user-data
d8b4ef7 
Add Sentry User Data
@oguzkocer
Bump version number
5298fb7
@oguzkocer
Update release notes.
3e41363
@oguzkocer
Update FluxC version to 1.6.14
6366f1d
@oguzkocer oguzkocer added the Releases Label related to managing releases label Jun 15, 2020
@oguzkocer oguzkocer requested a review from jkmassel June 15, 2020 19:59
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Jun 15, 2020 •
edited
Loading

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

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/15.1-code-freeze-to-master
  3. git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/WordPress-Android/12203
  4. Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/WordPress-Android/12203 and open a new PR.
📖

This PR contains changes in the subtree libs/utils/. It is your responsibility to ensure these changes are merged back into wordpress-mobile/WordPress-Utils-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/15.1-code-freeze-to-master
  3. git subtree push --prefix=libs/utils/ https://github.com/wordpress-mobile/WordPress-Utils-Android.git merge/WordPress-Android/12203
  4. Browse to https://github.com/wordpress-mobile/WordPress-Utils-Android/pull/new/merge/WordPress-Android/12203 and open a new PR.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Jun 15, 2020 •
edited
Loading

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

@jkmassel jkmassel merged commit b4fb424 into master Jun 16, 2020
@oguzkocer oguzkocer deleted the merge/15.1-code-freeze-to-master branch June 18, 2020 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkmassel jkmassel jkmassel approved these changes

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

Successfully merging this pull request may close these issues.