zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
718 Commits 33 Branches 366 Tags 67 MiB
Commit Graph

718 Commits

Author SHA1 Message Date
sunxiaojian 33016d9cf4 chore: rename hashTag to hashtag 2021-04-07 21:01:32 +08:00
CMK e4b15cc951
Merge pull request #91 from tootsuite/feature/profile-coordinator 
Implement profile coordinator
 2021-04-07 20:55:37 +08:00
sunxiaojian d800e10bd7 feature: add search history 2021-04-07 19:49:33 +08:00
CMK 08d105f7b7 chore: make hashtag inject with compose kind 2021-04-07 17:10:58 +08:00
CMK ecd595c6e8 chore: correct hashtag typo 2021-04-07 16:56:31 +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
sxiaojian88 7b0dd37b77
Merge pull request #88 from tootsuite/feature/searchRecommend 
feature: search recommend page
 2021-04-07 09:56:00 +08:00
CMK 1d6345b12b fix: text checker not learn reply post mention word issue 2021-04-06 17:52:37 +08:00
CMK 0822b222fc fix: debug running may assert fail issue 2021-04-06 17:48:20 +08:00
CMK 4828625309 Merge branch 'develop' into feature/profile-coordinator 2021-04-06 17:32:37 +08:00
CMK e4199df42c feat: set background color for banner image view 2021-04-06 17:18:06 +08:00
CMK 021d6036cd chore: update dark mode color for background. Make blocking high priority then blocked 2021-04-06 17:12:25 +08:00
CMK 9612cc3902 feat: handle blocking and blocked state for profile 2021-04-06 16:43:08 +08:00
CMK 824d214ce7 chore: update color asset 2021-04-06 16:42:45 +08:00
sunxiaojian 608e916320 chore: remove extension from MastodonSDK 2021-04-02 20:45:33 +08:00
CMK 28cfe96171 chore: rename Toot -> Status 2021-04-02 19:40:15 +08:00
CMK 2f89471c78 feat: add remote profile load logic for profile scene 2021-04-02 19:33:29 +08:00
CMK 3b576badeb feat: add reply entry for profile scene 2021-04-02 18:50:08 +08:00
CMK 5d3b6d1943 feat: handle profile follow, block, and mute actions 2021-04-02 18:13:45 +08:00
jk234ert 412a7dc508 Merge branch 'feat/hastagTimeline' of https://github.com/tootsuite/mastodon-ios into feat/hastagTimeline 2021-04-02 17:05:44 +08:00
jk234ert a9d35109fd feat: update mechanism of calculating number of people taking tags 2021-04-02 17:05:06 +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 c0bd7c2497 chore: change .black to asset color. 2021-04-02 16:50:07 +08:00
jk234ert 4f77688d03 feat: add nativation title view 2021-04-02 16:38:33 +08:00
CMK 7f08bc5c41
Merge pull request #86 from tootsuite/feature/profile 
Add profile scene
 2021-04-02 15:10:47 +08:00
sunxiaojian f24aee739e chore: rename file name and code format 2021-04-02 12:10:12 +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
sxiaojian88 fa14477f7d
Merge pull request #80 from tootsuite/fix/serverRulesUI 
fix: Update server rules scene UI design
 2021-04-01 16:00:13 +08:00
CMK efbb32648c chore: update naming for StatusFetchedResultsController 2021-04-01 14:54:15 +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
sxiaojian88 379884b001
Merge pull request #84 from tootsuite/feature/searchAPI 
Feature/search api
 2021-04-01 11:52:17 +08:00
sunxiaojian 0f8e3dafe8 chore: remove useless code 2021-04-01 11:50:35 +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
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 dff874af76 feature: add SearchRecommendTagsCollectionViewCell 2021-03-31 20:56:11 +08:00
sunxiaojian 09320bf99c chore: add api to APIService 2021-03-31 19:30:21 +08:00