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
|
37480fe67b
|
feat: cancel sign-out user notification subscription when received
|
2021-04-27 18:05:29 +08:00 |
CMK
|
125f6d0a27
|
feat: show received notification status
|
2021-04-27 17:45:11 +08:00 |
CMK
|
ed9c2ddd8f
|
feat: handle notification response
|
2021-04-27 17:27:03 +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 |
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 |
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
|
731b49aaa0
|
chore: suggestion use v2 api
|
2021-04-20 15:40:10 +08:00 |
sunxiaojian
|
bd9860b792
|
Merge branch 'develop' into feature/notification
|
2021-04-19 18:07:21 +08:00 |
ihugo
|
8c7149af89
|
fix: server-side data is inconsistent with local
|
2021-04-18 02:02:08 +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
|
ca7eb7bb12
|
chore: code format
|
2021-04-16 13:45:54 +08:00 |
sunxiaojian
|
80d76acc27
|
chore: format file
|
2021-04-15 10:16:30 +08:00 |
sunxiaojian
|
2d71a48e36
|
chore: fix order of notification and layout issue
|
2021-04-14 17:13:23 +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 |
ihugo
|
901176e14d
|
fix: fix compile error caused by git merge
|
2021-04-13 17:37:13 +08:00 |
ihugo
|
23a06f04ab
|
fixed: subscription API call
|
2021-04-13 17:15:58 +08:00 |
ihugo
|
191370e712
|
feature: settings
|
2021-04-13 17:15:58 +08:00 |
sunxiaojian
|
7bf6328252
|
chore: code format and add layer.cornerCurve = .continuous
|
2021-04-13 13:06:35 +08:00 |
sunxiaojian
|
a59208a643
|
Merge branch 'develop' into feature/searching
|
2021-04-13 09:43:54 +08:00 |
sunxiaojian
|
0418ec1470
|
chore: recommend account use CoreData dateSource
|
2021-04-09 13:09:30 +08:00 |
CMK
|
14176be4ed
|
feat: handle suspended account in profile scene
|
2021-04-08 17:06:03 +08:00 |
CMK
|
b6269c7643
|
feat: add favorite scene
|
2021-04-08 17:06:02 +08:00 |
sunxiaojian
|
0dab9acd91
|
fix: tag and searchHistory repeated save in CoreDate
|
2021-04-08 12:22:05 +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 |
CMK
|
9612cc3902
|
feat: handle blocking and blocked state for profile
|
2021-04-06 16:43:08 +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
|
5d3b6d1943
|
feat: handle profile follow, block, and mute actions
|
2021-04-02 18:13:45 +08:00 |
BradGao
|
f40f62e573
|
Merge branch 'develop' into feat/hastagTimeline
|
2021-04-02 16:50:31 +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 |
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 |
CMK
|
e3fa472f3f
|
feat: implement post publishing progress bar UI and publish failure retry logic
|
2021-03-29 17:44:52 +08:00 |
CMK
|
c35fcfb08f
|
feat: make image attachments uploading in the queue
|
2021-03-22 18:40:32 +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
|
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
|
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
|
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
|
1a60428f2a
|
feat: implement emojis preloading logic
|
2021-03-15 19:25:44 +08:00 |
CMK
|
6eb3816bab
|
chore: renaming reblog
|
2021-03-15 18:19:45 +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 |
sunxiaojian
|
20283d1878
|
chore: change video and audio notification string
|
2021-03-15 15:08:58 +08:00 |
CMK
|
9f02197873
|
feat: add custom emojis API endpoint
|
2021-03-15 14:40:10 +08:00 |
CMK
|
1746c1fc77
|
feat: add toolbar for compose scene
|
2021-03-12 15:23:28 +08:00 |
CMK
|
71c5ca327a
|
chore: make fetch free from exception
|
2021-03-11 14:34:10 +08:00 |
CMK
|
6b5bb4f178
|
chore: make the database request Fail-Fast
|
2021-03-11 14:08:00 +08:00 |
sunxiaojian
|
6c0a767435
|
chore: auto-pause when audio cell disappeared
|
2021-03-11 13:16:44 +08:00 |
CMK
|
f4136d03ba
|
fix: add missing fetchLimit
|
2021-03-11 11:43:49 +08:00 |
sunxiaojian
|
2657dde184
|
chore: the play interrupts event could be sent with the notification
|
2021-03-10 21:19:56 +08:00 |
CMK
|
75d39aabf0
|
feat: add reply to header for toot
|
2021-03-10 19:12:53 +08:00 |
sunxiaojian
|
7556e57de9
|
fix: conflict between gif video and audio
|
2021-03-10 17:17:15 +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
|
a5f2bf2334
|
chore: code cleanup
|
2021-03-10 14:09:38 +08:00 |
CMK
|
2ac2eb7c77
|
Merge commit /develop into feature/reblog
|
2021-03-10 10:30:07 +08:00 |
CMK
|
81c22fee24
|
fix: count not change after undo boost and undo favorite issue
|
2021-03-09 19:41:18 +08:00 |
CMK
|
51b6455c37
|
chore: rename reblog API
|
2021-03-09 19:40:32 +08:00 |
CMK
|
fd4e99907b
|
fix: slider jumping after drag issue. Fix player can not play again issue
|
2021-03-09 18:54:21 +08:00 |
sunxiaojian
|
2b02b8deb6
|
fix: play audio between two toots
|
2021-03-09 17:13:17 +08:00 |
sunxiaojian
|
04d960c890
|
Merge branch 'develop' into feature/audio
|
2021-03-09 17:02:03 +08:00 |
sunxiaojian
|
0ae89aff9f
|
fix: can't play audio again when stoped
|
2021-03-09 16:54:05 +08:00 |
CMK
|
441a6aee9e
|
feat: implement boost for toot
|
2021-03-09 15:18:43 +08:00 |
sunxiaojian
|
2d4dbad535
|
chore: fix slider shake, reset audioView when stoped
|
2021-03-09 15:18:36 +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
|
54c7610c7f
|
chore: [WIP] refactor pick server scene with diffable data source
|
2021-03-06 00:46:53 +08:00 |
CMK
|
0df1a57865
|
feat: implement multiple poll
|
2021-03-05 15:53:36 +08:00 |
CMK
|
11cee6df35
|
feat: implement single vote poll
|
2021-03-05 13:41:48 +08:00 |
CMK
|
06aac878c8
|
feat: [WIP] make the vote poll logic works
|
2021-03-04 18:53:29 +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
|
80954b0492
|
feat: add Poll and PollOption entity to CoreDataStack
|
2021-03-02 15:51:16 +08:00 |
CMK
|
2988e71611
|
chore: update UI appearance. remove not used separator line component
|
2021-02-24 18:40:47 +08:00 |
CMK
|
98ebddc438
|
feat: implement image media status cell UI
|
2021-02-23 19:18:34 +08:00 |
sunxiaojian
|
e4989cfe30
|
chore: add keyboardWillShowNotification to KeyboardResponderService
|
2021-02-22 12:51:35 +08:00 |
CMK
|
6285cb95fa
|
fix: AutoLayout issue. Update keyboard listener. Expose server error message
|
2021-02-20 19:54:08 +08:00 |
CMK
|
9e0a7bb352
|
feat: add stub categories
|
2021-02-19 12:17:12 +08:00 |
CMK
|
c919a724ab
|
feat: implement onboarding /servers and /categories endpoint
|
2021-02-19 11:56:51 +08:00 |
sunxiaojian
|
9670ad2924
|
chore: update toot relationship in CoreData
|
2021-02-18 14:32:29 +08:00 |
sunxiaojian
|
99f2e4a854
|
chore: code format and define onceRequestTootMaxCount
|
2021-02-18 13:09:40 +08:00 |
sunxiaojian
|
b55790fee8
|
feat: finish user favourite action
|
2021-02-08 18:29:27 +08:00 |
sunxiaojian
|
5f1800b353
|
feat: HomeTimeline
|
2021-02-07 16:19:33 +08:00 |
CMK
|
7d1c8e5be9
|
feat: [WIP] implement sign up scene
|
2021-02-05 17:53:00 +08:00 |
CMK
|
1b3c9b2099
|
feat: add sign out debug menu
|
2021-02-05 15:58:48 +08:00 |
CMK
|
2ebb12b86e
|
feat: add APIService.Persist.persistTimeline method and make public timeline load oldest works
|
2021-02-04 14:45:44 +08:00 |
CMK
|
ade8b68a65
|
Merge branch 'develop' into feature/home-timeline-api
|
2021-02-04 13:51:52 +08:00 |
sunxiaojian
|
ee663cc18f
|
chore: code error fix
|
2021-02-04 11:35:25 +08:00 |
sunxiaojian
|
1f7819565e
|
chore: implement Toot createOrMerge
|
2021-02-04 10:48:45 +08:00 |
CMK
|
6daccf5170
|
feat: add home timeline api
|
2021-02-03 18:52:47 +08:00 |
sunxiaojian
|
3557916747
|
chore: add application property in toot
|
2021-02-03 17:24:15 +08:00 |
CMK
|
2c6a0e383a
|
feat: implement authentication scene
|
2021-02-03 16:01:08 +08:00 |
CMK
|
36c1807182
|
feat: [WIP] add authentication scene
|
2021-02-02 19:31:10 +08:00 |
CMK
|
b749d0a7bc
|
fix: Toot.emojis wrong keyPath issue
|
2021-02-02 16:19:46 +08:00 |
CMK
|
9c54095f40
|
Merge '/develop' into feature/authentication
# Conflicts:
# Mastodon.xcodeproj/project.pbxproj
# Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
|
2021-02-02 15:53:17 +08:00 |
sunxiaojian
|
03dd6a7329
|
code format and resolve all the comments.
|
2021-02-02 14:10:25 +08:00 |
sunxiaojian
|
7c19e569c9
|
Add Assets Color
Update public timeline cell's UI
add ActionToolBar
|
2021-02-02 10:29:48 +08:00 |
sunxiaojian
|
24ca4644de
|
status content display
|
2021-01-29 16:47:32 +08:00 |
sunxiaojian
|
cb690ffa4e
|
add public timeline
|
2021-01-28 16:10:30 +08:00 |