zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
2,199 Commits 33 Branches 360 Tags 66 MiB
Commit Graph

462 Commits

Author SHA1 Message Date
CMK dae423f28f fix: missing notification author name tapping handling. resolve #197 2021-07-06 17:38:04 +08:00
CMK 0ef3c0f7c8 fix: i18n string plural issue 2021-07-06 14:55:24 +08:00
CMK cca8432fb6 fix: vector assert not correct rendered issue 2021-07-06 11:59:28 +08:00
CMK f4a2dd7f85 chore: update version to 0.8.4 (29) 2021-07-06 11:31:20 +08:00
CMK d03d39a14d feat: add theme 2021-07-05 20:21:11 +08:00
CMK a26d453a2e chore: update version to 0.8.3 (28) 2021-07-03 03:33:27 +08:00
CMK 0690bc9892 fix: bar tint color and notification missing new status background color issue 2021-07-03 03:22:17 +08:00
CMK c0c461b9c6 chore: update version to 0.8.2 (27) 2021-07-02 20:12:35 +08:00
CMK 86da7a8ba1 fix: GIF not load in some scene issue 2021-07-02 19:48:56 +08:00
CMK a614e0c156 fix: line break not works for <p> tag issue 2021-07-02 19:48:26 +08:00
CMK f4a2792b0f chore: update cell highlighted color for Dark Mode 2021-07-02 14:00:39 +08:00
CMK 7384b82ba3 chore: update version to 0.8.1 (26) 2021-07-01 20:24:58 +08:00
CMK 5567bdd447 fix: add tolerance for media preview dismiss gesture trigger 2021-07-01 19:18:41 +08:00
CMK bdf5a7e859 fix: make link works in notification scene 2021-07-01 18:57:05 +08:00
CMK 85e39115e7 fix: open email wrong path and redirect missing issue 2021-07-01 11:49:30 +08:00
CMK 7ebb236f7d chore: update version to 0.8.0 (25) 2021-06-30 20:20:49 +08:00
CMK b10f3eef3d feat: update dark mode color panel 2021-06-30 20:11:38 +08:00
CMK 72b2176fdd chore: update version to 0.7.7 (24) 2021-06-30 18:23:54 +08:00
CMK 6126c15c66 fix: emoji picker set wrong selected range after insert text issue 2021-06-30 15:30:25 +08:00
CMK 93a72cbada chore: update version to 0.7.7 (23) 2021-06-30 13:06:12 +08:00
CMK 71cb19ccae fix: auto-complete emoji may crash issue 2021-06-29 19:19:55 +08:00
CMK b7d5b711cb chore: update package version 2021-06-29 17:58:22 +08:00
CMK 65887f963a feat: using replica status view in compose scene 2021-06-29 17:08:41 +08:00
CMK b435857214 feat: complete compose scene refactor 2021-06-29 16:41:58 +08:00
CMK 2d374f5908 chore: [WIP] migrate compose scene from collection view to table view. Add MetaTextView 2021-06-28 19:43:09 +08:00
CMK d88317225e chore: update to version 0.7.6 (22) 2021-06-24 19:59:07 +08:00
CMK 0f131a11ea chore: update version to 0.7.5 (21) 2021-06-24 11:50:06 +08:00
CMK e87d76a9de fix: content warning overlay wrong appearance under Dark Mode issue 2021-06-24 11:40:49 +08:00
CMK ab19323bcd fix: image fetch task not reset before reuse issue 2021-06-24 10:27:18 +08:00
CMK 01972b0612 chore: update version to 0.7.4 (20) 2021-06-23 23:43:35 +08:00
CMK 4325ca3127 fix: content warning user interaction not cancel after disappear issue 2021-06-23 22:59:39 +08:00
CMK 51e8db0c0b chore: update version to 0.7.3 (19) 2021-06-23 20:50:21 +08:00
CMK 51c29fa564 fix: toggle content overlay not works for reblog issue. Update content overlay UI 2021-06-23 20:47:49 +08:00
CMK b593938767 chore: add FPSIndicator for debugging 2021-06-23 14:45:28 +08:00
CMK 721822c9bd chore: update version to 0.7.2 (18) 2021-06-22 20:55:08 +08:00
CMK a07104053c chore: update version to 0.7.2 (17) 2021-06-22 20:52:07 +08:00
CMK 1d4f425d14 fix: content offset fixed after toggle segmented control issue. resolve #151 2021-06-22 18:28:27 +08:00
CMK a23fc3cab8 fix: "clear" button wrong i18n string issue in searching scene 2021-06-22 17:47:21 +08:00
CMK 0a622f6ca8 chore: isolate ASDK build 2021-06-22 13:41:40 +08:00
CMK b2070d3c34 chore: add ASDK compiler flag. Update version to 0.7.1 (16) 2021-06-21 20:46:58 +08:00
CMK 5b74763c23 chore: update version to 0.7.1 (15) 2021-06-21 20:37:35 +08:00
CMK 579d45b675 chore: add async entry 2021-06-21 20:27:43 +08:00
CMK 68e9aedd50 Merge commit 'feature/texture' into develop 
# Conflicts:
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
 2021-06-21 19:52:44 +08:00
CMK 2dfd6168a9 fix: handle status delete UI updater in thread scene 2021-06-21 16:38:59 +08:00
CMK 69a7517fde feat: add content for StatusNode. Migrate HTML parser from Kanna to Fuzi 2021-06-21 00:14:47 +08:00
CMK 1a3135b998 feat: [WIP] migrate to Texture (AsyncDisplayKit) for better performance 2021-06-19 18:33:29 +08:00
Eugen Rochko c1c10ce660 Add boop sound for notifications 2021-06-19 00:14:41 +02:00
CMK 9f34b58d50 chore: update version to 0.7.0 (14) 2021-06-18 19:07:42 +08:00
CMK 1493b6700c feat: update notification service for toot-relay 2021-06-18 18:57:02 +08:00
CMK 2e37f8e55f chore: update version to 0.6.3 (13) 2021-06-17 19:44:40 +08:00
CMK 931197e51c chore: profile status header and name label configure 2021-06-17 16:31:34 +08:00
CMK ef95fbc298 chore: update version to 0.6.2 (12) 2021-06-16 20:05:47 +08:00
CMK f5e3ec7c76 feat: using Nuke framework for timeline image loading 2021-06-16 19:58:40 +08:00
CMK a413adc613 feat: cache placeholder and blurhash more efficiency 2021-06-16 18:32:48 +08:00
CMK 6c50c49988 chore: update version to 0.6.1 (11) 2021-06-15 19:33:11 +08:00
CMK 49b5e12f27 Merge branch 'fix-codes-typo' into fix/typo 2021-06-15 19:03:41 +08:00
Eugen Rochko 8f67eed60f Fix typos in class and file names 2021-06-14 23:09:50 +02:00
CMK 1298131bc2 chore: update bundle ID. Update version to 0.6.0 (10) 2021-06-12 04:37:54 +08:00
CMK 6e9cd64473 chore: update version to 0.6.0 (9) 2021-06-09 14:42:58 +08:00
CMK 5983455849 feat: add keyboard click sound for custom emoji picker 2021-06-07 14:30:42 +08:00
CMK 02f9a15069 fix: custom emoji picker using compact default height on the iPad issue 2021-06-07 14:22:03 +08:00
CMK a5938eb0e1 chore: update version to 0.6.0 (8) 2021-06-04 18:46:00 +08:00
CMK 3ab78f1134 feat: adapt AuthenticationSession for authentication 2021-06-04 18:31:57 +08:00
CMK 8b47e12087 chore: update version to 0.6.0 (7) 2021-06-02 14:59:59 +08:00
CMK a44d09d13d chore: update version to 0.6.0 (6) 2021-06-01 16:05:31 +08:00
CMK 8b94102289 feat: update status timestamp behavior. resolve #82 2021-06-01 14:31:31 +08:00
CMK a9744146ce feat: add video attachment post supports 2021-05-31 16:42:49 +08:00
CMK b15974dcfb feat: add profile field and update ActiveLabel entity supports 2021-05-27 13:56:55 +08:00
CMK bc686318c5 feat: update version to 0.5.0 (5) 2021-05-21 19:36:08 +08:00
CMK 443c863465 feat: add segment control shortcut for profile scene 2021-05-21 17:42:14 +08:00
CMK aec7a1f5ea feat: add navigation shortcut for notification scene 2021-05-21 16:52:47 +08:00
CMK c44ced7501 feat: add keyboard navigate for timeline 2021-05-21 15:23:02 +08:00
CMK 5cbfa28b93 feat: add keyboard shortcuts for tabs 2021-05-19 15:15:19 +08:00
CMK 3927f1630a feat: implement auto complete for emoji/hashtag/mention 2021-05-18 14:25:32 +08:00
CMK c2c38c9307 feat: [WIP] add auto completion view for compose highlight 2021-05-14 20:02:59 +08:00
CMK ff465ac18c chore: update project settings for App Store 2021-05-13 18:46:19 +08:00
CMK 1a48b38b09 chore: update version to 0.4.0 (4) 2021-05-13 17:51:05 +08:00
CMK 46baa59d37 feat: add picker server loader. Set chevron image for expand button 2021-05-13 17:50:37 +08:00
CMK 78eaf226a4 chore: add ar language code supports 2021-05-13 14:46:40 +08:00
CMK 8d16a1cec4 chore: update package version 2021-05-13 11:41:35 +08:00
CMK 6ba6598b96 feat: add accessibility supports for timeline 2021-05-12 18:26:53 +08:00
CMK 1eed6e4986 fix: media photo preview transition top and bottom bar missing mask issue 2021-05-11 16:11:00 +08:00
CMK 36273467c1 Merge branch 'develop' into release/0.4.0 
# Conflicts:
#	Mastodon/Scene/Share/View/Content/StatusView.swift
 2021-05-10 18:54:08 +08:00
CMK 6a54beca1e Merge branch 'develop' into feature/post-emoji 2021-05-10 18:48:47 +08:00
CMK b63ae6800b feat: add a11y for server category picker 2021-05-07 20:02:28 +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
CMK 9a255bbd84 Merge branch 'develop' into fix/profile-and-fix-issue 2021-05-07 11:07:06 +08:00
sunxiaojian 5f921c1537 Merge branch 'develop' into feature/statusMenu 2021-05-06 16:31:34 +08:00
CMK 2a18244d84 fix: learn word cost too much CPU issue. Update TwitterTextEditor package source to upstream 2021-05-06 16:25:40 +08:00
CMK 678ea6b3fc Merge branch 'develop' into feature/media-preview 2021-04-30 19:31:58 +08:00
CMK aceaa618e0 feat: add context menu for post image 2021-04-30 19:28:06 +08:00
sunxiaojian 0403cc0109 Merge branch 'develop' into feature/statusMenu 2021-04-30 12:57:43 +08:00
CMK aace886401 feat: add save photo action for image preview scene 2021-04-29 19:49:46 +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 23491e60b9 chore: add userProvider 
chore: add userProvider
 2021-04-28 20:00:13 +08:00
CMK 7d8ffd187a feat: add media preview for status image 2021-04-28 15:02:34 +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 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
CMK 59760696b5 feat: set badge auto increment and clear when app resume 2021-04-26 18:19:20 +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
sxiaojian88 bcdb55f9f0
Merge pull request #110 from tootsuite/feature/suggestion 
Feature/suggestion
 2021-04-23 04:49:06 -07:00
ihugo 008bb49d2d fix: add selection state of report status 2021-04-23 09:37:18 +08:00
ihugo ce3f4f5e96 refactor: Use single file organization classes. 2021-04-22 23:02:24 +08:00
sunxiaojian e664722b13 chore: update UI/UX of suggestion account 2021-04-22 19:58:42 +08:00
ihugo 23d9853a71 Merge branch 'develop' into feature/report 
# Conflicts:
#	CoreDataStack/Entity/Status.swift
 2021-04-22 12:54:16 +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
CMK 04d427ea93 feat: make content warning works in the notification scene 2021-04-20 13:18:27 +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
sunxiaojian bb03c10ef6 chore: apply review suggestions 2021-04-19 17:06:39 +08:00
sunxiaojian f6be51dd0f chore: remove UIView+Contraint 2021-04-19 12:25:01 +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 cfdd2ea670 chore: use stackView 2021-04-16 22:31:52 +08:00
CMK e3c6aaf64e fix: blurhash image render issue 2021-04-16 20:29:08 +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 687614d43a feat: add bottom loader 2021-04-14 19:04:11 +08:00
CMK 6c973ed17c fix: resolve #83 the text editor input content offset reset after input character issue 2021-04-14 18:11:59 +08:00
sunxiaojian bffb0a887b chore: rename searchBottomLoader , rename pure color 2021-04-14 18:00:43 +08:00
sunxiaojian f3394ff382 feat: add navigation to Notification Cell 2021-04-14 17:48:09 +08:00
sunxiaojian 288a8025ce chore: use NotificationStatusTableViewCell and NotificationTableViewCell 2021-04-14 16:24:40 +08:00
CMK 0eff43e1d1 feat: update compose scene UI appearance 2021-04-14 15:24:54 +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 db3d16be41 fix: use readable guider to layout section header 2021-04-13 18:12:40 +08:00
ihugo 901176e14d fix: fix compile error caused by git merge 2021-04-13 17:37:13 +08:00
sunxiaojian a59208a643 Merge branch 'develop' into feature/searching 2021-04-13 09:43:54 +08:00
sunxiaojian 567c2af0ee chore: add followAction 2021-04-09 19:39:35 +08:00
CMK 4faacdf1be feat: implement profile infos editing 2021-04-09 17:31:43 +08:00
CMK 0ddf9d8abe chore: code clean up 2021-04-08 18:54:35 +08:00
CMK 3b03ed63ce feat: add share action for profile scene 2021-04-08 18:52:35 +08:00
CMK 14176be4ed feat: handle suspended account in profile scene 2021-04-08 17:06:03 +08:00
CMK a0a636917f feat: add title view for favorite scene 2021-04-08 17:06:02 +08:00
CMK b6269c7643 feat: add favorite scene 2021-04-08 17:06:02 +08:00
sunxiaojian cc4290385d chore: rename recommend 2021-04-08 14:01:22 +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 d800e10bd7 feature: add search history 2021-04-07 19:49:33 +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
BradGao 502ceeabe2
Merge pull request #89 from tootsuite/feat/hastagTimeline 
Feat/hastag timeline
 2021-04-07 16:38:08 +08:00
jk234ert 2d65bda7fe chore: migrate HashtagViewModel to use `StatusFetchedResultsController` 2021-04-07 16:37:05 +08:00
CMK af4fcf9dfd Merge branch 'develop' into feature/profile-coordinator 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-04-07 14:44:58 +08:00
jk234ert a61e662f38 fix: resolve requested changes 2021-04-07 13:57:03 +08:00
sunxiaojian 90803fc544 chore: add bottom loader 2021-04-07 11:27:30 +08:00
sunxiaojian 6e10efc490 feature:searching page 
feature: searching Page
 2021-04-07 11:21:56 +08:00
CMK e4199df42c feat: set background color for banner image view 2021-04-06 17:18:06 +08:00
CMK 9612cc3902 feat: handle blocking and blocked state for profile 2021-04-06 16:43:08 +08:00
sunxiaojian 608e916320 chore: remove extension from MastodonSDK 2021-04-02 20:45:33 +08:00
CMK 2f89471c78 feat: add remote profile load logic for profile scene 2021-04-02 19:33:29 +08:00
CMK 5d3b6d1943 feat: handle profile follow, block, and mute actions 2021-04-02 18:13:45 +08:00
sunxiaojian e1696134a8 Merge branch 'develop' into feature/searchRecommend 2021-04-02 17:04:08 +08:00
BradGao f40f62e573
Merge branch 'develop' into feat/hastagTimeline 2021-04-02 16:50:31 +08:00
sunxiaojian f24aee739e chore: rename file name and code format 2021-04-02 12:10:12 +08:00
sunxiaojian 458ab6bcda feature: search recommend page 2021-04-02 11:48:22 +08:00
jk234ert b63a5ebe5f feat: use search api to fetch tag info 2021-04-02 10:21:51 +08:00
CMK bd89b19724 Merge branch 'develop' into feature/profile 2021-04-01 16:01:24 +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
sunxiaojian 0584576055 fix: Update server rules scene UI design 2021-04-01 14:40:58 +08:00
CMK 43ee11b863 feat: [WIP] add profile scene 2021-04-01 14:39:15 +08:00
jk234ert d548840bd9 feat: implement hashtag timeline 2021-04-01 11:56:50 +08:00
sunxiaojian dff874af76 feature: add SearchRecommendTagsCollectionViewCell 2021-03-31 20:56:11 +08:00
sunxiaojian 09320bf99c chore: add api to APIService 2021-03-31 19:30:21 +08:00
sunxiaojian 9ddd8365d0 feature: add search API 2021-03-31 15:00:28 +08:00
BradGao f26857a311
Merge pull request #79 from tootsuite/fix/pickServerEmptyStateViewPadding 
fix: adjust empty state view horizontal padding
 2021-03-31 08:35:36 +08:00
jk234ert ed88923901 fix: adjust empty state view horizontal padding 2021-03-29 22:02:27 +08:00
CMK d9533deccf chore: update version to 0.3.0 (3) 2021-03-29 17:45:19 +08:00
CMK e3fa472f3f feat: implement post publishing progress bar UI and publish failure retry logic 2021-03-29 17:44:52 +08:00
CMK 87a6a4df77 feat: add counter and emoji picker activity indicator 2021-03-26 19:16:32 +08:00
CMK 610ee36835 feat: add content warning editor for status compose scene 2021-03-25 18:17:05 +08:00
CMK df66cc6b4a feat: implement emoji picker 2021-03-25 15:56:17 +08:00
CMK d05f97951b feat: add expires duration selector for poll 2021-03-24 14:49:27 +08:00
CMK b8e062c92e feat: add poll UI/UX for compose scene 2021-03-23 18:47:21 +08:00
CMK d64a06aa9d Merge branch 'develop' into feature/compose-attachment-image 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Service/APIService/APIService+Status.swift
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Statuses.swift
 2021-03-22 17:55:55 +08:00
CMK b296b21ef0 feat: add image attachments reorder support for status compose scene 2021-03-22 17:48:35 +08:00
CMK 75d10b76c8 feat: implement image upload logic 2021-03-18 19:42:26 +08:00
CMK 296d29f3e0 feat: implement status publish API 2021-03-18 17:33:07 +08:00
CMK 1b3ba1ccfb feat: add pick compose image attachment logic 2021-03-18 15:16:35 +08:00
CMK 5ecce85bfd feat: add image media attachment item for diffable data source 2021-03-17 18:09:38 +08:00
CMK de5279f20d Merge branch /develop into feature/in-reply-to-header 
# Conflicts:
#	Mastodon/Resources/en.lproj/Localizable.strings
 2021-03-17 17:01:24 +08:00
sunxiaojian 62ad86b313 chore: add sawToothView 2021-03-17 12:17:48 +08:00
CMK 4873d8649b chore: renaming status 2021-03-17 11:33:25 +08:00
CMK 6e87b581b9 Merge branch /develop into feature/in-reply-to-header 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
#	Mastodon/State/AppContext.swift
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Statuses.swift
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift
 2021-03-17 11:24:25 +08:00
CMK 0b1b3ecbbd Merge branch 'develop' into feature/welcome-illustration 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 19:01:41 +08:00
CMK bda216626a Merge branch /develop into feature/welcome-illustration 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 18:24:48 +08:00
CMK c5582c7aaf Merge branch /develop into feature/compose 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 15:59:26 +08:00
CMK f0b08e2b56 Merge branch 'develop' into feature/welcome-illustration 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
#	Mastodon/Extension/MastodonSDK/Mastodon+Entidy+ErrorDetailReason.swift
 2021-03-16 15:42:15 +08:00
sunxiaojian b60fe36b25 chore: add publishing state in navigationBar 2021-03-16 11:45:30 +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 c8c296d1ba Merge branch /develop into feature/compose 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
#	Mastodon/State/AppContext.swift
#	MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift
 2021-03-16 11:28:32 +08:00
sunxiaojian 21362b56c3 chore: add gesture to scroll manually 2021-03-15 20:23:27 +08:00