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

173 Commits

Author SHA1 Message Date
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
sunxiaojian 04eeb0100e fix: safely cancel the listenser for status 2021-05-08 10:38:55 +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
sunxiaojian b8f3f4c886 fix: remove ActionToolbarContainer.moreButtonDidPressed 2021-05-06 18:19:24 +08:00
sunxiaojian 8011298571 fix: ignore indexPath for userProvider 2021-05-06 18:03:58 +08:00
sunxiaojian 5f921c1537 Merge branch 'develop' into feature/statusMenu 2021-05-06 16:31:34 +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 514e5b0443 chore: remove useless change 2021-04-30 15:38:15 +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 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 236b5ca0dc fix: add observer for more menu 2021-04-29 10:50:10 +08:00
sunxiaojian 273305cda9 chore: show menu in statusCell 2021-04-28 20:00:18 +08:00
sxiaojian88 ee5e2bde1f
Merge branch 'develop' into feature/followrequest 2021-04-27 19:43:47 +08:00
sunxiaojian 193b69b6b1 fix: change accept to reject 2021-04-27 19:41:55 +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
Hugo 2e8183adc6
Merge pull request #111 from tootsuite/feature/report 
Feature/report
 2021-04-27 17:53:20 +08:00
sunxiaojian d03346c0de fix: add followrequest cell action 2021-04-27 16:54:23 +08:00
CMK 9c3e4a706e Merge branch develop into feature/push-notification 2021-04-27 16:29:34 +08:00
sunxiaojian 42f63808df feature: add follow request notification 2021-04-27 14:27:27 +08:00
ihugo 36a6b8b8cc Merge branch 'develop' into feature/report 
# Conflicts:
#	Localization/app.json
 2021-04-26 17:53:38 +08:00
ihugo 7eb79414a4 fix: memery leak 2021-04-26 17:41:24 +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
ihugo ad8df6813f fix: add entries for the reporting 2021-04-26 16:34:05 +08:00
ihugo 1b05d787df fix: make report-status can be revealed 2021-04-25 23:49:19 +08:00
ihugo e9d015720b refactor: use `tableView.allowsMultipleSelection` 2021-04-25 18:28:47 +08:00
sunxiaojian 00794a259a fix: pick server scene Dark Mode 2021-04-25 02:00:05 -07:00
sxiaojian88 bcdb55f9f0
Merge pull request #110 from tootsuite/feature/suggestion 
Feature/suggestion
 2021-04-23 04:49:06 -07:00
sunxiaojian 61a26fbe66 fix: refresh block state when view will appear 2021-04-23 10:47:31 +08:00
ihugo 008bb49d2d fix: add selection state of report status 2021-04-23 09:37:18 +08:00
sunxiaojian 67f813a946 fix: update followState when view will appear 2021-04-22 20:35:41 +08:00
sunxiaojian e664722b13 chore: update UI/UX of suggestion account 2021-04-22 19:58:42 +08:00
sunxiaojian 326aea36cd fix: The empty view should not display when the user just sign-in the first time 2021-04-22 15:45:32 +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 f6e785a894 feat: set GIF pause and auto resume when toggle content warning overlay 2021-04-20 13:40:14 +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
CMK 4041929b3e feat: fulfill the content warning when compose reply post 2021-04-19 19:13:20 +08:00
CMK 81a1028f20 feat: pause video playback when set reveal state to false 2021-04-19 19:09:34 +08:00
sunxiaojian eb89ff6bdc fix: rename NotificationTableViewCell to NotificationStatusTableViewCell 2021-04-19 18:16:28 +08:00
sunxiaojian da19f8f641 chore: remove Redundant codes 2021-04-19 18:06:02 +08:00