Commit Graph

1469 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
CMK b7258dc7f2 fix: set reveal button hidden in the compose scene 2021-04-19 19:15:49 +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
sxiaojian88 19e0a3599c
Merge pull request #105 from tootsuite/feature/notification
Feature/notification
2021-04-19 03:10:50 -07:00
sunxiaojian bd9860b792 Merge branch 'develop' into feature/notification 2021-04-19 18:07:21 +08:00
sunxiaojian da19f8f641 chore: remove Redundant codes 2021-04-19 18:06:02 +08:00
CMK f7aa5c123d fix: compose scene layout issue when presenting reply post 2021-04-19 17:50:58 +08:00
sunxiaojian bb03c10ef6 chore: apply review suggestions 2021-04-19 17:06:39 +08:00
Hugo fdf66ee9c6
Merge pull request #102 from tootsuite/feature/settings-rebase
Feature/settings
2021-04-19 14:17:40 +08:00
sunxiaojian c814065edb fix: Scroll view has ambiguous scrollable content height and ViewDebug warning 2021-04-19 12:39:16 +08:00
sunxiaojian f6be51dd0f chore: remove UIView+Contraint 2021-04-19 12:25:01 +08:00
sunxiaojian 5ae2c44642 chore: remove useless code 2021-04-19 10:10:46 +08:00
sunxiaojian 462fafe706 chore: add navigation to ThreadScene 2021-04-18 22:10:36 +08:00
ihugo 8c7149af89 fix: server-side data is inconsistent with local 2021-04-18 02:02:08 +08:00
ihugo e42af11bf7 chore: generate strings and assets 2021-04-17 14:19:16 +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 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
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
CMK d5366c2d07
Merge pull request #103 from tootsuite/feature/post-thread
Add thread scene and reply post support
2021-04-16 18:17:34 +08:00
sunxiaojian ca7eb7bb12 chore: code format 2021-04-16 13:45:54 +08:00
ihugo 0ebf86bd43 docs: add comments for hard code 2021-04-15 17:17:19 +08:00
sunxiaojian ecf622b866 fix: statusView layout issue 2021-04-15 12:35:40 +08:00
CMK ccb74b08f7 feat: make reply to foldable in compose scene 2021-04-15 12:10:43 +08:00
CMK 83904126dd chore: update face smiling icon 2021-04-15 11:38:47 +08:00
CMK 12a3164a21 fix: segmented control selection missing update issue 2021-04-15 11:21:33 +08:00
CMK 39c635705e chore: update background color 2021-04-15 11:21:07 +08:00
CMK 2507a7324e fix: set missing font for relationship action button 2021-04-15 11:05:19 +08:00
sunxiaojian 845080a69d fix: NotificationCell nameLabel and actionLabel layout issue 2021-04-15 10:53:03 +08:00
sunxiaojian 56d22e9c1c chore: use readableContentGuide 2021-04-15 10:37:46 +08:00
sunxiaojian 80d76acc27 chore: format file 2021-04-15 10:16:30 +08:00
sunxiaojian 2e86449c41 fix: bottom loader display aways 2021-04-14 20:02:41 +08:00
CMK aa3dff0770 feat: update thread dark mode background color 2021-04-14 19:49:50 +08:00
CMK 1723891099 chore: update background dark mode to follow system naming 2021-04-14 19:45:09 +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 2d71a48e36 chore: fix order of notification and layout issue 2021-04-14 17:13:23 +08:00
ihugo ceba2772c1 fix: remove magic numbers to make it clear and robust 2021-04-14 16:41:30 +08:00
sunxiaojian 288a8025ce chore: use NotificationStatusTableViewCell and NotificationTableViewCell 2021-04-14 16:24:40 +08:00
CMK 56bd6d0ae8 feat: set compose initial visibility following the account lock setting 2021-04-14 16:17:34 +08:00
CMK d5c9473528 feat: implement reply status entry and update query of API 2021-04-14 15:59:29 +08:00
sunxiaojian d99fb1af76 chore: make segment work in notification 2021-04-14 15:56:06 +08:00
sunxiaojian 66b07f41db chore: display status Content 2021-04-14 15:38:05 +08:00