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

54 Commits

Author SHA1 Message Date
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
ihugo 9be8b95aea fix: use right privacyURL 
- remove some redundancy code
 2021-04-17 14:01:57 +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
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
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 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 1c6f231fee Merge branch /develop into feature/in-reply-to-header 
# Conflicts:
#	Localization/app.json
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Diffiable/Section/StatusSection.swift
#	Mastodon/Resources/en.lproj/Localizable.strings
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift
 2021-03-16 11:41:56 +08:00
CMK 75d39aabf0 feat: add reply to header for toot 2021-03-10 19:12:53 +08:00
CMK 807dfd9ea7 feat: profile persist logic. Add replyTo and replyFrom relationship for Toot 2021-03-10 16:38:14 +08:00
CMK 2ac2eb7c77 Merge commit /develop into feature/reblog 2021-03-10 10:30:07 +08:00
CMK 441a6aee9e feat: implement boost for toot 2021-03-09 15:18:43 +08:00
sunxiaojian 30d03a3894 chore: add audio support for toot 2021-03-09 14:37:55 +08:00
sunxiaojian 8bce197136 chore: make media_attachments.preview_url optional 
It's null when toot has audio
So the document is wrong
 2021-03-09 14:25:19 +08:00
CMK 4ce3f96dae chore: use setPrimitiveValue 2021-03-06 13:04:30 +08:00
CMK 06aac878c8 feat: [WIP] make the vote poll logic works 2021-03-04 18:53:29 +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 30c035e09a feat: implement auto refresh logic for Poll 2021-03-03 16:12:48 +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 9670ad2924 chore: update toot relationship in CoreData 2021-02-18 14:32:29 +08:00
sunxiaojian b55790fee8 feat: finish user favourite action 2021-02-08 18:29:27 +08:00
sunxiaojian 5f1800b353 feat: HomeTimeline 2021-02-07 16:19:33 +08:00
CMK 87c734c734 fix: app group typo issue 2021-02-05 16:30:36 +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
CMK b749d0a7bc fix: Toot.emojis wrong keyPath issue 2021-02-02 16:19:46 +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