zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity
6,287 Commits 35 Branches 73 Tags 62 MiB
Commit Graph

79 Commits

Author SHA1 Message Date
Nathan Mattes b2dbcc8095 Merge branch 'develop' into ios-192-profile-about 
# Conflicts:
#	Mastodon/Protocol/Provider/DataSourceProvider+NotificationTableViewCellDelegate.swift
#	Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController+DataSourceProvider.swift
#	MastodonSDK/Sources/MastodonCore/DataController/FeedDataController.swift
#	MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift
 2024-01-31 15:36:53 +01:00
Marcus Kida 383a75ea48
Improve status updating mechanism (#1210) 2024-01-30 23:02:13 +01:00
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
Marcus Kida 976f934df9
Remove Status from CoreData (#1167) 2024-01-08 11:17:40 +01:00
Nathan Mattes 7ab194b15d
Remove remaining Tag-stuff (IOS-186) (#1205) 2024-01-05 16:46:49 +01:00
Marcus Kida c30fb73922
Fix status deletion not updating data model (IOS-205) 2023-12-05 12:28:36 +01:00
Marcus Kida e0671eb324
Reimplement favorite/reblog state (IOS-176) 2023-11-23 11:21:52 +01:00
Marcus Kida b010b6112e
Remove usage of Status (IOS-176) 2023-11-22 12:32:04 +01:00
Nathan Mattes e473084038
Simplify Theme (#1121) 2023-09-27 15:08:12 +02:00
Nathan Mattes 778b44ecf4 Fix warnings 2023-09-22 15:27:46 +02:00
Nathan Mattes fbde2a5833 More cleanup 2023-09-22 15:27:46 +02:00
Nathan Mattes 92ca2a006c Fix colors for hashtag-follow-button 2023-09-20 21:04:49 +02:00
Nathan Mattes 8060017880
IOS-113, bullet 4: Replace icons (#980) 
Co-authored-by: Marcus Kida <marcus.kida@bearologics.com>
 2023-03-20 08:45:28 +01:00
Nathan Mattes 0c224f47df
Implement post editing / edit history (#875) 
Co-authored-by: Marcus Kida <marcus.kida@bearologics.com>
Co-authored-by: Jed Fox <git@jedfox.com>
 2023-03-02 11:06:13 +01:00
Jed Fox 0c8c9778b0
Merge remote-tracking branch 'upstream/develop' into status-cards 2022-12-15 07:46:37 -05:00
Marcus Kida 2d9e980215
feat: Implement /api/v2/instance to conditionally show Translation option 2022-12-12 16:41:13 +01:00
Jed Fox 7e74b4beb3
Merge remote-tracking branch 'upstream/develop' into status-cards 2022-12-03 13:49:04 -05:00
Jed Fox 3661b5ce90
Refactor compose intialization 
- split ComposeContentViewModel.Kind into Destination (top level/reply) and an initial content string
- replies get the mentions prepended to the initial content string
 2022-12-03 13:25:07 -05:00
Marcus Kida 6c2fabaa03
chore: Fix hashtag follow button style 2022-12-01 14:52:55 +01:00
Marcus Kida 324e782fd5
chore: Improve Hashtag Header Post Count label alignment 2022-12-01 14:31:56 +01:00
Marcus Kida 270bb6a1ed
fix: Update HashtagTimelineHeaderView if follow state changes 2022-12-01 12:38:23 +01:00
Marcus Kida 0c571a2df6
fix: Localizable string issues 2022-12-01 10:55:00 +01:00
Marcus Kida 6a9b29e4a6
chore: Add missing L10n 2022-12-01 10:54:59 +01:00
Marcus Kida 855d2cbacd
feat: Implement followed tags overview 2022-12-01 10:54:59 +01:00
Marcus Kida b9e4c69576
feat: Implement follow/unfollow tag functionality 2022-12-01 10:54:59 +01:00
Marcus Kida b020f566f4
feat: Implement real numbers of HashtagTimelineHeader 2022-12-01 10:54:59 +01:00
Marcus Kida 9d245d3205
feat: Fix follow hashtags header layout 2022-12-01 10:54:59 +01:00
Marcus Kida 178a6e503a
feat: Implement layout for hashtag timeline header view 2022-12-01 10:54:58 +01:00
Nathan Mattes d4eabf95d1
Merge pull request #622 from painhapp/refactorPinToParent 
[Refactor] Use UIView extension to create constraints (to parent view)
 2022-11-17 23:19:03 +01:00
Nathan Mattes 96c3e17531 Fix some warnings 2022-11-17 23:16:21 +01:00
Stefan Painhapp abe25f2156 Refactor pin to (parent) layout constraints as extension of UIView 2022-11-18 01:45:27 +09:00
Kyle Bashour 7b3c7bbd7b Fix refresh control positioning 2022-11-14 14:09:59 -08:00
CMK 02e3ad9a16 chore: [WIP] restore the replyTo entry for compose 2022-10-10 19:14:52 +08:00
CMK bb5c999bea chore: [WIP] inject AuthContext into ViewModel 2022-10-09 20:07:57 +08:00
CMK fa27a28a60 chore: move core logic into package 2022-10-08 13:43:06 +08:00
CMK 39ff50212b feat: supports hashtag timeline pull-down-refresh 2022-05-16 11:34:20 +08:00
CMK fe93c8b4f7 feat: add keyboard commands for discovery posts, tag. And also restore for hashtag timeline and profile scene 2022-05-11 18:40:21 +08:00
CMK ca0a697cd0 chore: update navigation bar button item assets 2022-05-06 15:17:26 +08:00
CMK 792208aebb feat: restore post filter supports 2022-02-15 19:44:45 +08:00
CMK 573ed8fd8d fix: update the Xcode version to fix the CI failure 2022-01-27 21:50:02 +08:00
CMK b76b3a2750 feat: adapt the app to async & await. Update timeline UI 2022-01-27 21:23:39 +08:00
CMK c6fc5cc09d feat: update to new UI tint style 2021-10-29 14:58:09 +08:00
CMK cba963a81e chore: update snapshot update logic for iOS 15 new default behavior 2021-10-11 14:11:10 +08:00
CMK 80ea6ac913 fix: status menu cause memory leaking issue 2021-09-30 14:19:15 +08:00
CMK 1da803fb97 feat: add recent search history in sidebar 2021-09-27 11:38:15 +08:00
CMK ddd1d0f6e4 chore: update project for new i18n resources 2021-08-09 19:44:04 +08:00
CMK cfc5987528 feat: add APNG supports for more label 2021-07-23 19:10:27 +08:00
CMK 0f8c5c0792 feat: add prefetching logic for status content 2021-07-15 09:56:26 +08:00
CMK 0dacea6326 feat: add filter for status 2021-07-09 19:07:12 +08:00
CMK 489f8d0448 fix: background color may set with delay issue 2021-07-06 18:00:39 +08:00