zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity
731 Commits 33 Branches 456 Tags
Commit Graph

106 Commits

Author SHA1 Message Date
CMK
3ab78f1134 feat: adapt AuthenticationSession for authentication 2021-06-04 18:31:57 +08:00
CMK
b15974dcfb feat: add profile field and update ActiveLabel entity supports 2021-05-27 13:56:55 +08:00
CMK
6a54beca1e Merge branch 'develop' into feature/post-emoji 2021-05-10 18:48:47 +08:00
sunxiaojian
d3256f3171 fix: delete reblogFrom inNotifications poll pollOption when delete status 2021-05-07 20:36:31 +08:00
CMK
faeb8d99ef feat: display custom emoji for timeline post 2021-05-07 18:25:57 +08:00
sunxiaojian
5278002c15 feat: Add post delete action entry for user posts 2021-05-07 16:08:07 +08:00
sunxiaojian
8a5c62990e chore: add BlockDomainService 2021-04-30 15:08:35 +08:00
sunxiaojian
0403cc0109 Merge branch 'develop' into feature/statusMenu 2021-04-30 12:57:43 +08:00
sunxiaojian
33401b4e1f feature: finish domainBlock action and domainUnblick action 2021-04-30 12:53:25 +08:00
sxiaojian88
26116a222e
Merge pull request #120 from tootsuite/fix/acctLookup 
fix: acct lookup support
 2021-04-29 19:24:30 +08:00
sxiaojian88
e94432f615
Merge pull request #115 from tootsuite/feature/followrequest 
Feature/followrequest
 2021-04-29 17:08:06 +08:00
sunxiaojian
ccdc48add1 feature: blockDomain 2021-04-29 17:01:36 +08:00
sunxiaojian
9768721247 fix: the Core Data thread-safe issue 2021-04-29 16:20:18 +08:00
sunxiaojian
a9fdd2efa3 fix: acct lookup support 2021-04-28 13:23:23 +08:00
sxiaojian88
ee5e2bde1f
Merge branch 'develop' into feature/followrequest 2021-04-27 19:43:47 +08:00
CMK
5d52fc4578 Merge branch develop into feature/push-notification 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
#	Mastodon/Scene/Settings/SettingsViewModel.swift
 2021-04-27 18:16:56 +08:00
CMK
125f6d0a27 feat: show received notification status 2021-04-27 17:45:11 +08:00
CMK
ed9c2ddd8f feat: handle notification response 2021-04-27 17:27:03 +08:00
CMK
aca358db26 feat: persist notification keys into Keychian 2021-04-27 16:26:59 +08:00
sunxiaojian
381bf37926 fix: delete old notifications in CoreData 2021-04-27 15:33:47 +08:00
ihugo
36a6b8b8cc Merge branch 'develop' into feature/report 
# Conflicts:
#	Localization/app.json
 2021-04-26 17:53:38 +08:00
CMK
7d9a37e52f Merge branch 'develop' into feature/push-notification 
# Conflicts:
#	Mastodon/Coordinator/SceneCoordinator.swift
 2021-04-26 17:04:19 +08:00
CMK
cbd598739e feat: make push notification trigger update when change setting 2021-04-26 16:57:50 +08:00
CMK
9001289801 feat: add push notification 2021-04-25 12:48:29 +08:00
ihugo
e3df692c3f feat: report 2021-04-22 12:52:11 +08:00
sunxiaojian
c8474c6a7f feature: suggestion account scene 2021-04-21 16:17:42 +08:00
sunxiaojian
731b49aaa0 chore: suggestion use v2 api 2021-04-20 15:40:10 +08:00
sunxiaojian
bd9860b792 Merge branch 'develop' into feature/notification 2021-04-19 18:07:21 +08:00
ihugo
8c7149af89 fix: server-side data is inconsistent with local 2021-04-18 02:02:08 +08:00
ihugo
f6dabb5e36 Merge branch 'develop' into feature/settings-rebase 
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Localization/app.json
#	Mastodon/Generated/Assets.swift
#	Mastodon/Generated/Strings.swift
#	Mastodon/Resources/en.lproj/Localizable.strings
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
 2021-04-17 14:13:01 +08:00
sunxiaojian
bc588e08db Merge branch 'develop' into feature/notification 2021-04-16 22:40:36 +08:00
sunxiaojian
ca7eb7bb12 chore: code format 2021-04-16 13:45:54 +08:00
sunxiaojian
80d76acc27 chore: format file 2021-04-15 10:16:30 +08:00
sunxiaojian
2d71a48e36 chore: fix order of notification and layout issue 2021-04-14 17:13:23 +08:00
CMK
d5c9473528 feat: implement reply status entry and update query of API 2021-04-14 15:59:29 +08:00
sunxiaojian
42628398e6 chore: display Notification Cell 2021-04-13 21:31:49 +08:00
sunxiaojian
773bfb6dd2 feature: notification API and CoreData 2021-04-13 19:56:35 +08:00
CMK
fccf9ee080 Merge branch 'develop' into feature/post-thread 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-04-13 19:48:13 +08:00
CMK
5417e42757 feat: implement thread scene 2021-04-13 19:46:42 +08:00
ihugo
901176e14d fix: fix compile error caused by git merge 2021-04-13 17:37:13 +08:00
ihugo
23a06f04ab fixed: subscription API call 2021-04-13 17:15:58 +08:00
ihugo
191370e712 feature: settings 2021-04-13 17:15:58 +08:00
sunxiaojian
7bf6328252 chore: code format and add layer.cornerCurve = .continuous 2021-04-13 13:06:35 +08:00
sunxiaojian
a59208a643 Merge branch 'develop' into feature/searching 2021-04-13 09:43:54 +08:00
sunxiaojian
0418ec1470 chore: recommend account use CoreData dateSource 2021-04-09 13:09:30 +08:00
CMK
14176be4ed feat: handle suspended account in profile scene 2021-04-08 17:06:03 +08:00
CMK
b6269c7643 feat: add favorite scene 2021-04-08 17:06:02 +08:00
sunxiaojian
0dab9acd91 fix: tag and searchHistory repeated save in CoreDate 2021-04-08 12:22:05 +08:00
CMK
fbe3a8c419 Merge branch 'develop' into feature/profile-coordinator 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Coordinator/SceneCoordinator.swift
#	Mastodon/Scene/Share/View/Content/StatusView.swift
#	Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift
 2021-04-07 16:55:07 +08:00
CMK
9612cc3902 feat: handle blocking and blocked state for profile 2021-04-06 16:43:08 +08:00