1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2024-12-15 18:29:36 +01:00
Commit Graph

44 Commits

Author SHA1 Message Date
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
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
sunxiaojian
ccdc48add1 feature: blockDomain 2021-04-29 17:01:36 +08:00
CMK
cbd598739e feat: make push notification trigger update when change setting 2021-04-26 16:57:50 +08:00
CMK
f8127428dd Merge branch 'develop' into feature/content-warning
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
2021-04-19 19:32:16 +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
CMK
680cf9a827 feat: add blurhash image and update content warning 2021-04-16 20:08:32 +08:00
sunxiaojian
ca7eb7bb12 chore: code format 2021-04-16 13:45:54 +08:00
CMK
d5c9473528 feat: implement reply status entry and update query of API 2021-04-14 15:59:29 +08:00
sunxiaojian
773bfb6dd2 feature: notification API and CoreData 2021-04-13 19:56:35 +08:00
ihugo
191370e712 feature: settings 2021-04-13 17:15:58 +08:00
sunxiaojian
a59208a643 Merge branch 'develop' into feature/searching 2021-04-13 09:43:54 +08:00
CMK
14176be4ed feat: handle suspended account in profile scene 2021-04-08 17:06:03 +08:00
sunxiaojian
0dab9acd91 fix: tag and searchHistory repeated save in CoreDate 2021-04-08 12:22:05 +08:00
sunxiaojian
c7eea5d8e6 Merge branch 'develop' into feature/searching 2021-04-07 21:08:41 +08:00
sunxiaojian
33016d9cf4 chore: rename hashTag to hashtag 2021-04-07 21:01:32 +08:00
sunxiaojian
d800e10bd7 feature: add search history 2021-04-07 19:49:33 +08:00
CMK
5d3b6d1943 feat: handle profile follow, block, and mute actions 2021-04-02 18:13:45 +08:00
CMK
499ddeb169 Merge branch 'develop' into feature/profile
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Localization/app.json
#	Mastodon.xcodeproj/project.pbxproj
2021-04-01 14:53:24 +08:00
CMK
43ee11b863 feat: [WIP] add profile scene 2021-04-01 14:39:15 +08:00
sunxiaojian
ada6d542f3 fix: decode error 2021-04-01 11:49:38 +08:00
CMK
807dfd9ea7 feat: profile persist logic. Add replyTo and replyFrom relationship for Toot 2021-03-10 16:38:14 +08:00
sunxiaojian
30d03a3894 chore: add audio support for toot 2021-03-09 14:37:55 +08:00
CMK
028f3a9404 feat: make poll cell label appearance update according to the underneath background 2021-03-03 19:34:29 +08:00
CMK
aea2ddc078 feat: make toot poll display 2021-03-02 19:10:45 +08:00
CMK
80954b0492 feat: add Poll and PollOption entity to CoreDataStack 2021-03-02 15:51:16 +08:00
CMK
98ebddc438 feat: implement image media status cell UI 2021-02-23 19:18:34 +08:00
sunxiaojian
5f1800b353 feat: HomeTimeline 2021-02-07 16:19:33 +08:00
CMK
2ebb12b86e feat: add APIService.Persist.persistTimeline method and make public timeline load oldest works 2021-02-04 14:45:44 +08:00
sunxiaojian
1f7819565e chore: implement Toot createOrMerge 2021-02-04 10:48:45 +08:00
sunxiaojian
3557916747 chore: add application property in toot 2021-02-03 17:24:15 +08:00
CMK
2c6a0e383a feat: implement authentication scene 2021-02-03 16:01:08 +08:00
sunxiaojian
df90f2ee68 add one-to-many relationship reblog in Toot 2021-02-02 14:49:55 +08:00
sunxiaojian
03dd6a7329 code format and resolve all the comments. 2021-02-02 14:10:25 +08:00
sunxiaojian
313ce3e54a add CoreData Classes Mention Tag History Emoji 2021-02-01 18:05:34 +08:00
sunxiaojian
24ca4644de status content display 2021-01-29 16:47:32 +08:00
sunxiaojian
cb690ffa4e add public timeline 2021-01-28 16:10:30 +08:00
CMK
1a000b96a8 feat: add Core Data Stack 2021-01-27 14:50:13 +08:00