sunxiaojian
|
bc588e08db
|
Merge branch 'develop' into feature/notification
|
2021-04-16 22:40:36 +08:00 |
sunxiaojian
|
ca7eb7bb12
|
chore: code format
|
2021-04-16 13:45:54 +08:00 |
CMK
|
d5c9473528
|
feat: implement reply status entry and update query of API
|
2021-04-14 15:59:29 +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 |
sunxiaojian
|
a59208a643
|
Merge branch 'develop' into feature/searching
|
2021-04-13 09:43:54 +08:00 |
CMK
|
ba48adb470
|
chore: make favorite and hashtag scene use next page token from response header
|
2021-04-08 17:06:03 +08:00 |
CMK
|
e7279a0ab6
|
chore: update query type
|
2021-04-08 17:06:02 +08:00 |
CMK
|
b6269c7643
|
feat: add favorite scene
|
2021-04-08 17:06:02 +08:00 |
sunxiaojian
|
27b698a97a
|
chore: add backgroud.navigation.color. update colors in searching page
|
2021-04-07 21:42:43 +08:00 |
sunxiaojian
|
c7eea5d8e6
|
Merge branch 'develop' into feature/searching
|
2021-04-07 21:08:41 +08:00 |
sunxiaojian
|
33016d9cf4
|
chore: rename hashTag to hashtag
|
2021-04-07 21:01:32 +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 |
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 |
sunxiaojian
|
608e916320
|
chore: remove extension from MastodonSDK
|
2021-04-02 20:45:33 +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 |
jk234ert
|
d548840bd9
|
feat: implement hashtag timeline
|
2021-04-01 11:56:50 +08:00 |
jk234ert
|
8c3040c0f9
|
feat: add hashtag timeline API
|
2021-04-01 11:54:31 +08:00 |
sunxiaojian
|
ada6d542f3
|
fix: decode error
|
2021-04-01 11:49:38 +08:00 |
sunxiaojian
|
fde5baad2e
|
chore: add translatesAutoresizingMaskIntoConstraints = false to all constrain method
|
2021-04-01 10:38:39 +08:00 |
sunxiaojian
|
dff874af76
|
feature: add SearchRecommendTagsCollectionViewCell
|
2021-03-31 20:56:11 +08:00 |
sunxiaojian
|
5ec07e617e
|
feature: add Suggestions API
|
2021-03-31 15:39:41 +08:00 |
sunxiaojian
|
0033ea0680
|
feature: add trends API
|
2021-03-31 15:00:42 +08:00 |
sunxiaojian
|
9ddd8365d0
|
feature: add search API
|
2021-03-31 15:00:28 +08:00 |
CMK
|
00e7450bcc
|
feat: add status visibility selector for status compose scene
|
2021-03-25 19:34:30 +08:00 |
CMK
|
610ee36835
|
feat: add content warning editor for status compose scene
|
2021-03-25 18:17:05 +08:00 |
CMK
|
0e84b4c164
|
feat: implement poll supports for status compose
|
2021-03-24 15:08:00 +08:00 |
CMK
|
d64a06aa9d
|
Merge branch 'develop' into feature/compose-attachment-image
# Conflicts:
# Mastodon.xcodeproj/project.pbxproj
# Mastodon/Service/APIService/APIService+Status.swift
# MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Statuses.swift
|
2021-03-22 17:55:55 +08:00 |
CMK
|
36b42ba3e7
|
feat: implement take photo and browser for image for compose scene
|
2021-03-19 19:49:48 +08:00 |
CMK
|
75d10b76c8
|
feat: implement image upload logic
|
2021-03-18 19:42:26 +08:00 |
CMK
|
296d29f3e0
|
feat: implement status publish API
|
2021-03-18 17:33:07 +08:00 |
CMK
|
4873d8649b
|
chore: renaming status
|
2021-03-17 11:33:25 +08:00 |
CMK
|
6e87b581b9
|
Merge branch /develop into feature/in-reply-to-header
# Conflicts:
# Mastodon.xcodeproj/project.pbxproj
# Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
# Mastodon/State/AppContext.swift
# MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Statuses.swift
# MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift
|
2021-03-17 11:24:25 +08:00 |
CMK
|
1c6f231fee
|
Merge branch /develop into feature/in-reply-to-header
# Conflicts:
# Localization/app.json
# Mastodon.xcodeproj/project.pbxproj
# Mastodon/Diffiable/Section/StatusSection.swift
# Mastodon/Resources/en.lproj/Localizable.strings
# MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift
|
2021-03-16 11:41:56 +08:00 |
CMK
|
c8c296d1ba
|
Merge branch /develop into feature/compose
# Conflicts:
# Mastodon.xcodeproj/project.pbxproj
# Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
# Mastodon/State/AppContext.swift
# MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift
|
2021-03-16 11:28:32 +08:00 |
CMK
|
6eb3816bab
|
chore: renaming reblog
|
2021-03-15 18:19:45 +08:00 |