Nathan Mattes febbc6f22a Merge branch 'develop' into ios-192-profile-about ... # Conflicts: # Mastodon.xcodeproj/project.pbxproj # Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift # Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift # Mastodon/Protocol/Provider/DataSourceFacade+Status.swift # Mastodon/Protocol/Provider/DataSourceProvider+NotificationTableViewCellDelegate.swift # Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift # Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift # Mastodon/Protocol/Provider/DataSourceProvider.swift # Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewController+DataSourceProvider.swift # Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel+State.swift # Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel.swift # Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController+DataSourceProvider.swift # Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel+State.swift # Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel.swift # Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController+DataSourceProvider.swift # Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+State.swift # Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel.swift # Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DataSourceProvider.swift # Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift # Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift # Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController+DataSourceProvider.swift # Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift # Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift # Mastodon/Scene/Profile/Bookmark/BookmarkViewController+DataSourceProvider.swift # Mastodon/Scene/Profile/Bookmark/BookmarkViewModel+State.swift # Mastodon/Scene/Profile/Bookmark/BookmarkViewModel.swift # Mastodon/Scene/Profile/Favorite/FavoriteViewController+DataSourceProvider.swift # Mastodon/Scene/Profile/Favorite/FavoriteViewModel+State.swift # Mastodon/Scene/Profile/Favorite/FavoriteViewModel.swift # Mastodon/Scene/Profile/MeProfileViewModel.swift # Mastodon/Scene/Profile/ProfileViewController.swift # Mastodon/Scene/Profile/ProfileViewModel.swift # Mastodon/Scene/Profile/RemoteProfileViewModel.swift # Mastodon/Scene/Profile/Timeline/UserTimelineViewController+DataSourceProvider.swift # Mastodon/Scene/Profile/Timeline/UserTimelineViewModel+State.swift # Mastodon/Scene/Profile/Timeline/UserTimelineViewModel.swift # Mastodon/Scene/Report/Report/ReportViewModel.swift # Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel+State.swift # Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift # Mastodon/Scene/Root/MainTab/MainTabBarController.swift # Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController+DataSourceProvider.swift # Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel+State.swift # Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel.swift # Mastodon/Scene/Share/View/Content/NotificationView+Configuration.swift # Mastodon/Scene/Thread/ThreadViewModel.swift # MastodonSDK/Sources/MastodonCore/FetchedResultsController/FeedFetchedResultsController.swift # MastodonSDK/Sources/MastodonCore/FetchedResultsController/StatusFetchedResultsController.swift # MastodonSDK/Sources/MastodonCore/Persistence/FileManager+SearchHistory.swift # MastodonSDK/Sources/MastodonCore/Persistence/FileManager+Timeline.swift # MastodonSDK/Sources/MastodonCore/Persistence/Persistence.swift # MastodonSDK/Sources/MastodonCore/Service/API/APIService+HomeTimeline.swift # MastodonSDK/Sources/MastodonCore/Service/API/APIService+Search.swift # MastodonSDK/Sources/MastodonSDK/MastodonStatus.swift # MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift # MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Publisher/MastodonStatusPublisher.swift # MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift		2024-01-08 22:32:57 +01:00
..
Community	Remove Status from CoreData (#1167)	2024-01-08 11:17:40 +01:00
ForYou	Emojis aren't optional (IOS-192)	2024-01-05 12:30:36 +01:00
Hashtags	Simplify Theme (#1121)	2023-09-27 15:08:12 +02:00
News	Simplify Theme (#1121)	2023-09-27 15:08:12 +02:00
Posts	Merge branch 'develop' into ios-192-profile-about	2024-01-08 22:32:57 +01:00
View	Simplify Theme (#1121)	2023-09-27 15:08:12 +02:00
DiscoveryItem.swift	Consider relationship and replace follow-button (IOS-194)	2023-11-20 13:51:20 +01:00
DiscoverySection.swift	Consider relationship and replace follow-button (IOS-194)	2023-11-20 13:51:20 +01:00
DiscoveryViewController.swift	Simplify Theme (#1121)	2023-09-27 15:08:12 +02:00
DiscoveryViewModel.swift	Remove Status from CoreData (#1167)	2024-01-08 11:17:40 +01:00