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 |
sunxiaojian
|
e664722b13
|
chore: update UI/UX of suggestion account
|
2021-04-22 19:58:42 +08:00 |
sunxiaojian
|
c8474c6a7f
|
feature: suggestion account scene
|
2021-04-21 16:17:42 +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
|
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 |
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
|
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 |