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 |
|
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 |
|
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
|
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
|
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
|
16fc1a85bd
|
fix: fix some reveiw issues
|
2021-04-13 17:18:04 +08:00 |
|
sunxiaojian
|
a59208a643
|
Merge branch 'develop' into feature/searching
|
2021-04-13 09:43:54 +08:00 |
|
CMK
|
ff13121b18
|
feat: add title view for profile scene
|
2021-04-09 19:44:48 +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 |
|
sunxiaojian
|
c7eea5d8e6
|
Merge branch 'develop' into feature/searching
|
2021-04-07 21:08:41 +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 |
|
CMK
|
af4fcf9dfd
|
Merge branch 'develop' into feature/profile-coordinator
# Conflicts:
# Mastodon.xcodeproj/project.pbxproj
|
2021-04-07 14:44:58 +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 |
|
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
|
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 |
|
sxiaojian88
|
379884b001
|
Merge pull request #84 from tootsuite/feature/searchAPI
Feature/search api
|
2021-04-01 11:52:17 +08:00 |
|
sxiaojian88
|
21b50da2bf
|
Merge pull request #76 from tootsuite/feature/avatarSelect
feature: Add context menu for avatar select for sign up page
|
2021-04-01 09:59:55 +08:00 |
|
sunxiaojian
|
09320bf99c
|
chore: add api to APIService
|
2021-03-31 19:30:21 +08:00 |
|
CMK
|
e3fa472f3f
|
feat: implement post publishing progress bar UI and publish failure retry logic
|
2021-03-29 17:44:52 +08:00 |
|