1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2024-12-08 06:42:04 +01:00
Commit Graph

630 Commits

Author SHA1 Message Date
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
sunxiaojian
732c5392d4 chore: show error with 18n 2021-03-01 17:16:28 +08:00
CMK
25c3d6e74d feat: add welcome illustration assets 2021-03-01 14:23:45 +08:00
CMK
21aad5cc4a fix: server rules scene do not alert error issue 2021-02-26 19:52:58 +08:00
CMK
d57d30ac21 chore: set AppIcon and update version to 0.1.0 (2) 2021-02-26 19:32:25 +08:00
CMK
b2c4d29d8d chore: update version to 0.1.0 (1) 2021-02-26 18:37:11 +08:00
CMK
bab6832da3 feat: add app version and build infos into system app setting panel 2021-02-26 18:36:38 +08:00
CMK
470f7bbd5e chore: set Development Assets 2021-02-26 18:30:13 +08:00
CMK
7aa45ff230 chore: make onboarding ready 2021-02-26 18:27:47 +08:00
CMK
ccf599feaa chore: make UI appearance match between onboarding scenes 2021-02-26 16:43:59 +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
sunxiaojian
5dbd015b16 chore: add OnboardingAppearance 2021-02-25 15:39:48 +08:00
BradGao
bcaff23704
Merge branch 'develop' into feat/serverPicker 2021-02-25 14:49:50 +08:00
jk234ert
027fec1cc9 feat: implement pick server view search cell & server list cell 2021-02-25 14:23:20 +08:00
jk234ert
eb7a33932e feat: implement pick server view category select 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
0ad43fb0eb chore: update Xcode Preview for StatusView. Rename MosaicImageView to MosaicImageViewContainer 2021-02-24 19:19:16 +08:00
sunxiaojian
2f053ee323 Merge branch 'develop' into feature/confirmEmail 2021-02-24 17:19:33 +08:00
CMK
4d2e75f3ca feat: implement content warning dismiss action logic 2021-02-24 16:11:48 +08:00
CMK
f455faa273 feat: add content warning (CW) for status text. 2021-02-24 15:29:16 +08:00
CMK
98ebddc438 feat: implement image media status cell UI 2021-02-23 19:18:34 +08:00
CMK
cee84d95a0 feat: update navigation bar items 2021-02-23 16:45:00 +08:00
CMK
87a7a1e91f chore: make sign in works 2021-02-23 15:44:59 +08:00
sunxiaojian
f5621991d8 feat: confirmEmail Page 2021-02-23 15:42:23 +08:00
CMK
e6ad839d3c Merge commit 'ea79ca771d441f1d0af2cd19872e3bdd227838e7' into feature/home
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-02-23 15:25:48 +08:00
CMK
40a524434f feat: update status cell UI 2021-02-23 15:16:55 +08:00
BradGao
8f5a52333a
Merge branch 'develop' into feat/welcomeView 2021-02-23 12:39:55 +08:00
jk234ert
85ceb48003 chore: resolve requested changes 2021-02-22 23:16:13 +08:00
CMK
9a79b9a545 feat: add MastodonServerRules scene 2021-02-22 16:20:44 +08:00
jk234ert
9fefdccef2 feat: add welcome view;
feat: modify window.rootViewController logic when app launches;
feat: enable ViewController-based status bar
2021-02-20 20:23:29 +08:00
CMK
6285cb95fa fix: AutoLayout issue. Update keyboard listener. Expose server error message 2021-02-20 19:54:08 +08:00
sunxiaojian
8ef5a34a40 feat: finish sign up page 2021-02-20 15:26:03 +08:00
jk234ert
8970231381 feat: add welcome view 2021-02-20 13:56:34 +08:00
CMK
c919a724ab feat: implement onboarding /servers and /categories endpoint 2021-02-19 11:56:51 +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
e0cd9f7565 Merge branch 'develop' into feature/sign-up
# Conflicts:
#	Mastodon/Scene/PublicTimeline/PublicTimelineViewModel.swift
2021-02-05 17:55:40 +08:00
CMK
7d1c8e5be9 feat: [WIP] implement sign up scene 2021-02-05 17:53:00 +08:00
sunxiaojian
5aa917e7bd fix : maintain contentOffset after refresh timeline 2021-02-05 16:50:40 +08:00
CMK
1b3c9b2099 feat: add sign out debug menu 2021-02-05 15:58:48 +08:00
sunxiaojian
6ff1a0c88e feat: add MiddleLoader 2021-02-05 14:58:05 +08:00
CMK
f2951d5b07 feat: add sign up button for authentication scene 2021-02-05 11:53:21 +08:00
CMK
1c3facf456 feat: display avatar bar button item for authenticated user 2021-02-04 19:37:38 +08:00
CMK
0abd8ab863 feat: add AvatarConfigurableView 2021-02-04 19:28:16 +08:00
CMK
45301fb72c fix: update ActiveLabel to v4.0.0 to fix url active entity may raise crash issue 2021-02-04 16:29:03 +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
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
sunxiaojian
04d4e7f33a feat: add bottomLoader 2021-02-03 17:23:25 +08:00
sunxiaojian
29439c9746 feat: add pull to refresh 2021-02-03 17:23:09 +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
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
CMK
0f8ad0c444 feat: add authentication scene 2021-02-02 15:38:54 +08:00
sunxiaojian
7c19e569c9 Add Assets Color
Update public timeline cell's UI
add ActionToolBar
2021-02-02 10:29:48 +08:00
sunxiaojian
313ce3e54a add CoreData Classes Mention Tag History Emoji 2021-02-01 18:05:34 +08:00
CMK
71de1ed9be feat: add OAuth API endpoint unit test 2021-01-29 19:38:11 +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
CMK
00173e5c30 feat: add Mastodon.API.App.create API 2021-01-27 16:01:20 +08:00
CMK
de99787782 chore: update Pod 2021-01-27 14:58:13 +08:00
CMK
1a000b96a8 feat: add Core Data Stack 2021-01-27 14:50:13 +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
CMK
16d1a35b0e Initial Commit 2021-01-22 13:54:11 +08:00