diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 3ac27bb8c09c..f7b455734218 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -5,6 +5,8 @@ 25.5 ----- * [***] Use web-based sign-in flow (hidden under a feature flag) [#23675] +* [*] Enable navigating to an individual post's stats from within the "view more" screen for author stats. [#23761] +* [*] [Jetpack-only] Enable pubishing to non-Jetpack sites when sharing content to the Jetpack app. [#23778] 25.4 ----- diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m index 005a72b94ac6..65460a71276d 100644 --- a/WordPress/Classes/Services/BlogService.m +++ b/WordPress/Classes/Services/BlogService.m @@ -32,7 +32,7 @@ - (void)syncBlogsForAccount:(WPAccount *)account id remote = [self remoteForAccount:account]; - BOOL filterJetpackSites = [AppConfiguration showJetpackSitesOnly]; + BOOL filterJetpackSites = false; [remote getBlogs:filterJetpackSites success:^(NSArray *blogs) { [[[JetpackCapabilitiesService alloc] init] syncWithBlogs:blogs success:^(NSArray *blogs) { @@ -404,7 +404,7 @@ - (void)associateSyncedBlogsToJetpackAccount:(WPAccount *)account { AccountServiceRemoteREST *remote = [[AccountServiceRemoteREST alloc] initWithWordPressComRestApi:account.wordPressComRestApi]; - BOOL filterJetpackSites = [AppConfiguration showJetpackSitesOnly]; + BOOL filterJetpackSites = false; [remote getBlogs:filterJetpackSites success:^(NSArray *remoteBlogs) { [self.coreDataStack performAndSaveUsingBlock:^(NSManagedObjectContext *context) { diff --git a/WordPress/Classes/Utility/App Configuration/AppConfiguration.swift b/WordPress/Classes/Utility/App Configuration/AppConfiguration.swift index d4153a559714..908067e13698 100644 --- a/WordPress/Classes/Utility/App Configuration/AppConfiguration.swift +++ b/WordPress/Classes/Utility/App Configuration/AppConfiguration.swift @@ -9,7 +9,6 @@ import Foundation @objc class AppConfiguration: NSObject { @objc static let isJetpack: Bool = false @objc static let isWordPress: Bool = true - @objc static let showJetpackSitesOnly: Bool = false @objc static let allowsNewPostShortcut: Bool = true @objc static let allowsConnectSite: Bool = true @objc static let allowSignUp: Bool = true diff --git a/WordPress/Jetpack/AppConfiguration.swift b/WordPress/Jetpack/AppConfiguration.swift index 761058497af0..f0a1e6d22ecf 100644 --- a/WordPress/Jetpack/AppConfiguration.swift +++ b/WordPress/Jetpack/AppConfiguration.swift @@ -9,7 +9,6 @@ import Foundation @objc class AppConfiguration: NSObject { @objc static let isJetpack: Bool = true @objc static let isWordPress: Bool = false - @objc static let showJetpackSitesOnly: Bool = false @objc static let allowsNewPostShortcut: Bool = true @objc static let allowsConnectSite: Bool = true @objc static let allowSignUp: Bool = true diff --git a/WordPress/WordPressShareExtension/AppExtensionsService.swift b/WordPress/WordPressShareExtension/AppExtensionsService.swift index 9ea97b190418..6a2a3352217b 100644 --- a/WordPress/WordPressShareExtension/AppExtensionsService.swift +++ b/WordPress/WordPressShareExtension/AppExtensionsService.swift @@ -96,10 +96,7 @@ extension AppExtensionsService { func fetchSites(onSuccess: @escaping ([RemoteBlog]?) -> (), onFailure: @escaping FailureBlock) { let remote = AccountServiceRemoteREST(wordPressComRestApi: simpleRestAPI) - var filterJetpackSites = false - #if IS_JETPACK - filterJetpackSites = true - #endif + let filterJetpackSites = false remote.getBlogs(filterJetpackSites, success: { blogs in guard let blogs = blogs as? [RemoteBlog] else {