1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-01-25 13:38:43 +01:00

325 Commits

Author SHA1 Message Date
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