zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
977 Commits 32 Branches 393 Tags 69 MiB
Commit Graph

317 Commits

Author SHA1 Message Date
sunxiaojian ccdc48add1 feature: blockDomain 2021-04-29 17:01:36 +08:00
sunxiaojian 23491e60b9 chore: add userProvider 
chore: add userProvider
 2021-04-28 20:00:13 +08:00
CMK 7d8ffd187a feat: add media preview for status image 2021-04-28 15:02:34 +08:00
sxiaojian88 ee5e2bde1f
Merge branch 'develop' into feature/followrequest 2021-04-27 19:43:47 +08:00
CMK 5d52fc4578 Merge branch develop into feature/push-notification 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
#	Mastodon/Scene/Settings/SettingsViewModel.swift
 2021-04-27 18:16:56 +08:00
CMK aca358db26 feat: persist notification keys into Keychian 2021-04-27 16:26:59 +08:00
sunxiaojian 381bf37926 fix: delete old notifications in CoreData 2021-04-27 15:33:47 +08:00
CMK 59760696b5 feat: set badge auto increment and clear when app resume 2021-04-26 18:19:20 +08:00
ihugo 36a6b8b8cc Merge branch 'develop' into feature/report 
# Conflicts:
#	Localization/app.json
 2021-04-26 17:53:38 +08:00
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
ihugo 008bb49d2d fix: add selection state of report status 2021-04-23 09:37:18 +08:00
ihugo ce3f4f5e96 refactor: Use single file organization classes. 2021-04-22 23:02:24 +08:00
sunxiaojian e664722b13 chore: update UI/UX of suggestion account 2021-04-22 19:58:42 +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
CMK 04d427ea93 feat: make content warning works in the notification scene 2021-04-20 13:18:27 +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 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
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
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 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 e4199df42c feat: set background color for banner image view 2021-04-06 17:18:06 +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
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
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
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
sunxiaojian 9ddd8365d0 feature: add search API 2021-03-31 15:00:28 +08:00
BradGao f26857a311
Merge pull request #79 from tootsuite/fix/pickServerEmptyStateViewPadding 
fix: adjust empty state view horizontal padding
 2021-03-31 08:35:36 +08:00
jk234ert ed88923901 fix: adjust empty state view horizontal padding 2021-03-29 22:02:27 +08:00
CMK d9533deccf chore: update version to 0.3.0 (3) 2021-03-29 17:45:19 +08:00
CMK e3fa472f3f feat: implement post publishing progress bar UI and publish failure retry logic 2021-03-29 17:44:52 +08:00
CMK 87a6a4df77 feat: add counter and emoji picker activity indicator 2021-03-26 19:16:32 +08:00
CMK 610ee36835 feat: add content warning editor for status compose scene 2021-03-25 18:17:05 +08:00
CMK df66cc6b4a feat: implement emoji picker 2021-03-25 15:56:17 +08:00
CMK d05f97951b feat: add expires duration selector for poll 2021-03-24 14:49:27 +08:00
CMK b8e062c92e feat: add poll UI/UX for compose scene 2021-03-23 18:47:21 +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 b296b21ef0 feat: add image attachments reorder support for status compose scene 2021-03-22 17:48:35 +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 1b3ba1ccfb feat: add pick compose image attachment logic 2021-03-18 15:16:35 +08:00
CMK 5ecce85bfd feat: add image media attachment item for diffable data source 2021-03-17 18:09:38 +08:00
CMK de5279f20d Merge branch /develop into feature/in-reply-to-header 
# Conflicts:
#	Mastodon/Resources/en.lproj/Localizable.strings
 2021-03-17 17:01:24 +08:00
sunxiaojian 62ad86b313 chore: add sawToothView 2021-03-17 12:17:48 +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 0b1b3ecbbd Merge branch 'develop' into feature/welcome-illustration 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 19:01:41 +08:00
CMK bda216626a Merge branch /develop into feature/welcome-illustration 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 18:24:48 +08:00
CMK c5582c7aaf Merge branch /develop into feature/compose 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 15:59:26 +08:00
CMK f0b08e2b56 Merge branch 'develop' into feature/welcome-illustration 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
#	Mastodon/Extension/MastodonSDK/Mastodon+Entidy+ErrorDetailReason.swift
 2021-03-16 15:42:15 +08:00
sunxiaojian b60fe36b25 chore: add publishing state in navigationBar 2021-03-16 11:45:30 +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
sunxiaojian 21362b56c3 chore: add gesture to scroll manually 2021-03-15 20:23:27 +08:00
sunxiaojian 0b046e4673 feature: add navigationBar state 2021-03-15 20:03:48 +08:00
CMK 1a60428f2a feat: implement emojis preloading logic 2021-03-15 19:25:44 +08:00
CMK 5b45224f7b feat: make media indicator view hide when playing video 2021-03-15 17:53:06 +08:00
CMK 8c466b67aa Merge branch /develop into feature/reblog 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Scene/Share/View/Content/StatusView.swift
#	Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift
 2021-03-15 16:15:47 +08:00
CMK 9f02197873 feat: add custom emojis API endpoint 2021-03-15 14:40:10 +08:00
CMK 92a26b2f73 feat: [WIP] add mention and hashtag input highlight. Add emoji token replacing logic 2021-03-12 19:25:28 +08:00
CMK 1746c1fc77 feat: add toolbar for compose scene 2021-03-12 15:23:28 +08:00
CMK d9e2453464 feat: make text editor automatic grow height during input 2021-03-12 14:18:07 +08:00
CMK 19a14b7761 chore: patch for delegate chain 2021-03-11 19:19:36 +08:00
sunxiaojian bbdd6926d6 chore: rename MosaicView to MosaicBlurView 2021-03-11 17:25:42 +08:00
CMK 97ecbb1bfb feat: add compose scene 2021-03-11 15:41:27 +08:00
sunxiaojian 6b9ae8d05d chore: add mosaicView 2021-03-11 15:10:41 +08:00
CMK 71c5ca327a chore: make fetch free from exception 2021-03-11 14:34:10 +08:00
sunxiaojian 6c0a767435 chore: auto-pause when audio cell disappeared 2021-03-11 13:16:44 +08:00
CMK 0be862c6b3 chore: remove useless extension for UIControl.State. Correct AvatarStackContainerButton filename 2021-03-11 11:19:31 +08:00
CMK 75d39aabf0 feat: add reply to header for toot 2021-03-10 19:12:53 +08:00
CMK 807dfd9ea7 feat: profile persist logic. Add replyTo and replyFrom relationship for Toot 2021-03-10 16:38:14 +08:00
sunxiaojian e1143b0ce4 feature: video & gifv support 2021-03-10 15:06:24 +08:00
CMK 1256ef1d8e feat: implement boost toot. Add stacked style avatar 2021-03-10 13:36:01 +08:00
CMK 2ac2eb7c77 Merge commit /develop into feature/reblog 2021-03-10 10:30:07 +08:00
sunxiaojian 04d960c890 Merge branch 'develop' into feature/audio 2021-03-09 17:02:03 +08:00
sunxiaojian 5a17b8a6ee chore: make slider enable state change with isPlaying 2021-03-09 16:25:47 +08:00
CMK 441a6aee9e feat: implement boost for toot 2021-03-09 15:18:43 +08:00
sunxiaojian 30d03a3894 chore: add audio support for toot 2021-03-09 14:37:55 +08:00
CMK 091839c2e4 feat: add multipart helper. Add update credentials endpoint 2021-03-08 18:17:15 +08:00
CMK 2e9af9c9cb Merge /develop into feature/poll 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
#	Mastodon/Diffiable/Item/Item.swift
 2021-03-07 22:26:05 +08:00
CMK 29653ca612 feat: set corner radius for the last cell layer 2021-03-06 13:30:06 +08:00
CMK 4ce3f96dae chore: use setPrimitiveValue 2021-03-06 13:04:30 +08:00
CMK e70fd532c4 feat: [WIP] display empty state when fetching server list 2021-03-06 12:55:52 +08:00
CMK 54c7610c7f chore: [WIP] refactor pick server scene with diffable data source 2021-03-06 00:46:53 +08:00
CMK 652c286c71 fix: password error prompt layout issue 2021-03-05 20:45:48 +08:00
CMK a3f9b8c2ef Merge branch 'develop' into feature/poll 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-05 15:55:29 +08:00
CMK 58c8eaabe8 feat: add animation for progress bar value change 2021-03-05 12:12:05 +08:00
CMK 2ed2a7d8a1 fix: make sign up error i18n display for each text filed. Fix memory leaking issue for pick server scene 2021-03-04 15:29:46 +08:00
CMK ba283bbdcb fix: appVersion not set issue 2021-03-04 10:51:49 +08:00
CMK 028f3a9404 feat: make poll cell label appearance update according to the underneath background 2021-03-03 19:34:29 +08:00
CMK 30c035e09a feat: implement auto refresh logic for Poll 2021-03-03 16:12:48 +08:00
CMK aea2ddc078 feat: make toot poll display 2021-03-02 19:10:45 +08:00
CMK 8b63c2fda1 feat: add PollSection and PollItem for diffable data source 2021-03-02 16:27:11 +08:00
sunxiaojian ea511c153f chore: set user avatar use PhotoUI 2021-03-02 16:19:20 +08:00
CMK 80954b0492 feat: add Poll and PollOption entity to CoreDataStack 2021-03-02 15:51:16 +08:00
CMK fc9310de20 feat: add motion effect for welcome illustration elements 2021-03-02 13:45:47 +08:00
CMK daba138c0e Merge branch 'develop' into feature/welcome-illustration 2021-03-02 12:53:33 +08:00
CMK eda3e95ad0 feat: add poll table view cell 2021-03-02 12:49:04 +08:00
sunxiaojian f6d9b12722 chore: update the i18n suggests 2021-03-02 10:25:49 +08:00