1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2024-12-22 06:19:03 +01:00
Commit Graph

346 Commits

Author SHA1 Message Date
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
ed9c2ddd8f feat: handle notification response 2021-04-27 17:27:03 +08:00
sunxiaojian
381bf37926 fix: delete old notifications in CoreData 2021-04-27 15:33:47 +08:00
sunxiaojian
124d4eef0a feature: add followRequest API 2021-04-27 14:43:38 +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
ihugo
3f62272162 fix: lost comment if send without comment first 2021-04-25 18:45:17 +08:00
ihugo
85014802c4 style: rename Id to ID 2021-04-25 15:48:37 +08:00
ihugo
cbc828eec2 refactor: remove UI part from ReportViewmodel 2021-04-25 15:36:40 +08:00
CMK
9001289801 feat: add push notification 2021-04-25 12:48:29 +08:00
ihugo
008bb49d2d fix: add selection state of report status 2021-04-23 09:37:18 +08:00
ihugo
1411bcadf6 doc: update doc for Report API 2021-04-22 22:58:55 +08:00
ihugo
e3df692c3f feat: report 2021-04-22 12:52:11 +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
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
ihugo
9be8b95aea fix: use right privacyURL
- remove some redundancy code
2021-04-17 14:01:57 +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
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
16fc1a85bd fix: fix some reveiw issues 2021-04-13 17:18:04 +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
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
CMK
9f02197873 feat: add custom emojis API endpoint 2021-03-15 14:40:10 +08:00
CMK
d9e2453464 feat: make text editor automatic grow height during input 2021-03-12 14:18:07 +08:00
CMK
75d39aabf0 feat: add reply to header for toot 2021-03-10 19:12:53 +08:00
CMK
2ac2eb7c77 Merge commit /develop into feature/reblog 2021-03-10 10:30:07 +08:00
CMK
51b6455c37 chore: rename reblog API 2021-03-09 19:40:32 +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
8bce197136 chore: make media_attachments.preview_url optional
It's null when toot has audio
So the document is wrong
2021-03-09 14:25:19 +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
8568debab0 feat: make diffable data source work with search text 2021-03-06 14:21:52 +08:00
CMK
06aac878c8 feat: [WIP] make the vote poll logic works 2021-03-04 18:53:29 +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
30c035e09a feat: implement auto refresh logic for Poll 2021-03-03 16:12:48 +08:00
sxiaojian88
fab3902561
Merge pull request #33 from tootsuite/feature/errorDetail
Feature/error detail
2021-03-02 10:26:55 +08:00
sunxiaojian
148a996129 chore: update the i18n suggests 2021-03-01 19:19:51 +08:00
sunxiaojian
732c5392d4 chore: show error with 18n 2021-03-01 17:16:28 +08:00
jk234ert
cff6a1d9ef fix: #30
fix: fix crash in server pick view when user input search text
fix: fix in pick server view, user cound is always zero
2021-03-01 17:08:31 +08:00
sunxiaojian
0cb8d1bf6e chore: add error detail 2021-03-01 15:40:40 +08:00
CMK
7aa45ff230 chore: make onboarding ready 2021-02-26 18:27:47 +08:00
sunxiaojian
522702386c feat: add support for inviteEnabled instance 2021-02-26 12:52:37 +08:00
jk234ert
c9f35ba9d2 Merge branch 'feat/serverPicker' of https://github.com/tootsuite/mastodon-ios into feat/serverPicker 2021-02-25 20:40:55 +08:00
jk234ert
ea24ea6514 fix: expand/collapse animation.
fix: use instance's uri as domain
2021-02-25 20:39:56 +08:00
BradGao
c9a63a9069
Merge branch 'develop' into feat/serverPicker 2021-02-25 17:59:43 +08:00
sunxiaojian
bf1a709548 Merge branch 'develop' into feature/confirmEmail 2021-02-25 15:41:13 +08:00
BradGao
bcaff23704
Merge branch 'develop' into feat/serverPicker 2021-02-25 14:49:50 +08:00
jk234ert
50035c1359 feat: implement pick server feature 2021-02-25 14:23:51 +08:00
jk234ert
027fec1cc9 feat: implement pick server view search cell & server list cell 2021-02-25 14:23:20 +08:00
sunxiaojian
35ef867adf chore: add account validation and webView email pre-fill 2021-02-24 20:12:15 +08:00
CMK
6182390699 fix: expiresAt attribute of Poll entity is not mark optional issue 2021-02-24 18:35:55 +08:00
CMK
98ebddc438 feat: implement image media status cell UI 2021-02-23 19:18:34 +08:00
CMK
8a48eb5847 feat: add rules attribute for Instance entity 2021-02-22 12:26:44 +08:00
CMK
6285cb95fa fix: AutoLayout issue. Update keyboard listener. Expose server error message 2021-02-20 19:54:08 +08:00
sunxiaojian
243d3362e6 chore: add Combine style valid logic 2021-02-20 18:24:23 +08:00
sunxiaojian
8ef5a34a40 feat: finish sign up page 2021-02-20 15:26:03 +08:00
BradGao
773a25e94a
Merge pull request #13 from tootsuite/feat/mastodonSDKRefactor
Feat/mastodon sdk refactor
2021-02-19 21:33:33 +08:00
jk234ert
4c36d0e12d fix: accountsInfo url 2021-02-19 21:32:41 +08:00
jk234ert
e44821bce8 feat: refactor the mastodonSDK
chore: update API docs
2021-02-19 17:40:05 +08:00
CMK
f98b1f6e9b
chore: mark proxiedThumbnail optional 2021-02-19 17:13:33 +08:00
CMK
912b6c021f
chore: remove version
Co-authored-by: BradGao <ugling88@hotmail.com>
2021-02-19 17:12:00 +08:00
CMK
4036cd870b
chore: remove version
Co-authored-by: BradGao <ugling88@hotmail.com>
2021-02-19 17:09:17 +08:00
CMK
b0b1e48b76 chore: remove blank line 2021-02-19 12:22:49 +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
jk234ert
2a84275288 fix: source in CredentialQuery 2021-02-18 23:17:28 +08:00
CMK
587d16a829 feat: add servers & categories API 2021-02-18 19:36:49 +08:00
jk234ert
9395f689ce feat: refactor query type; add several Account APIs and tests 2021-02-10 14:56:16 +08:00
sunxiaojian
b55790fee8 feat: finish user favourite action 2021-02-08 18:29:27 +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
f066e736eb feat: add Mastodon instance api 2021-02-05 12:10:34 +08:00
CMK
945331944f fix: poll option entity decode issue 2021-02-04 15:28:25 +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
6daccf5170 feat: add home timeline api 2021-02-03 18:52:47 +08:00
CMK
c4765e9a8a
fix: authorize URL unit test case 2021-02-03 16:31:26 +08:00
CMK
018d646609 chore: remove not not used typealias 2021-02-03 16:20:37 +08:00
CMK
09501cf2de chore: remove not used CodingKeys 2021-02-03 16:20:16 +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
71de1ed9be feat: add OAuth API endpoint unit test 2021-01-29 19:38:11 +08:00
CMK
fe83c02e03 feat: implement all entities 2021-01-29 14:49:25 +08:00
CMK
4c9e644820 feat: add some entities and make it pass unit tests 2021-01-28 19:28:37 +08:00
CMK
f8718510a6 feat: add partial Mastodon entities 2021-01-28 14:52:35 +08:00
CMK
d29f473898 feat: add Instance entity 2021-01-28 11:57:02 +08:00
CMK
00fb8eb175 fix: set header date formatter options 2021-01-28 11:56:48 +08:00
CMK
27a7ccbd88 feat: make Unit Test works 2021-01-27 18:52:01 +08:00
CMK
7ecbcec077 feat: add Toot & User entity 2021-01-27 18:46:14 +08:00
CMK
00173e5c30 feat: add Mastodon.API.App.create API 2021-01-27 16:01:20 +08:00
CMK
1a000b96a8 feat: add Core Data Stack 2021-01-27 14:50:13 +08:00
CMK
65d6ae6e11 chore: rename and cleanup 2021-01-26 18:11:44 +08:00
sunxiaojian
3d5afbd589 feat: add MastodonAPI 2021-01-26 17:38:30 +08:00
CMK
19ddb106ad chore: setup project 2021-01-22 14:28:58 +08:00