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

170 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
sunxiaojian 505c251b37 fix: move message to title 2021-05-10 15:40:46 +08:00
sunxiaojian d3256f3171 fix: delete reblogFrom inNotifications poll pollOption when delete status 2021-05-07 20:36:31 +08:00
CMK b63ae6800b feat: add a11y for server category picker 2021-05-07 20:02:28 +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 5f921c1537 Merge branch 'develop' into feature/statusMenu 2021-05-06 16:31:34 +08:00
CMK 51c01066d3 feat: add photo library permission checking 2021-05-06 15:05:24 +08:00
sunxiaojian 514e5b0443 chore: remove useless change 2021-04-30 15:38:15 +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
sunxiaojian 211e2f25d5 chore: add share post 2021-04-29 11:03:21 +08:00
sxiaojian88 ee5e2bde1f
Merge branch 'develop' into feature/followrequest 2021-04-27 19:43:47 +08:00
Hugo 2e8183adc6
Merge pull request #111 from tootsuite/feature/report 
Feature/report
 2021-04-27 17:53:20 +08:00
sunxiaojian 42f63808df feature: add follow request notification 2021-04-27 14:27:27 +08:00
sunxiaojian dcb1bb7053 fix: change delete to Delete, set deleteAction attributes: [.destructive] 2021-04-26 20:36:59 +08:00
ihugo 36a6b8b8cc Merge branch 'develop' into feature/report 
# Conflicts:
#	Localization/app.json
 2021-04-26 17:53:38 +08:00
ihugo ad8df6813f fix: add entries for the reporting 2021-04-26 16:34:05 +08:00
sunxiaojian 272f1c459e fix: add email svg with Dark Mode 2021-04-25 03:27:07 -07:00
sunxiaojian 491448e753 fix: register scene Dark Mode 2021-04-25 02:19:47 -07:00
sunxiaojian 00794a259a fix: pick server scene Dark Mode 2021-04-25 02:00:05 -07:00
ihugo 479f21fd9f chore: remove secondary and rename elevated color 2021-04-25 13:26:28 +08:00
sunxiaojian 490e168b7d fix: UI update in confirm email scene 2021-04-24 19:50:54 -07:00
sxiaojian88 bcdb55f9f0
Merge pull request #110 from tootsuite/feature/suggestion 
Feature/suggestion
 2021-04-23 04:49:06 -07:00
ihugo 3810588abb chor: restyle localized string 2021-04-22 22:58:21 +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
sunxiaojian e7cd130bf1 fix: L18n repair 2021-04-20 16:46:04 +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 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 780025a3ce chore: use systemBackground color 2021-04-16 22:58:36 +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
CMK 83904126dd chore: update face smiling icon 2021-04-15 11:38:47 +08:00
CMK 1723891099 chore: update background dark mode to follow system naming 2021-04-14 19:45:09 +08:00
sunxiaojian bffb0a887b chore: rename searchBottomLoader , rename pure color 2021-04-14 18:00:43 +08:00
sunxiaojian 66b07f41db chore: display status Content 2021-04-14 15:38:05 +08:00
CMK 0eff43e1d1 feat: update compose scene UI appearance 2021-04-14 15:24:54 +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 16fc1a85bd fix: fix some reveiw issues 2021-04-13 17:18:04 +08:00
ihugo 6f8b71f25f chore: remove .lock file 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