1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2024-12-16 10:48:49 +01:00
Commit Graph

794 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
36b42ba3e7 feat: implement take photo and browser for image for compose scene 2021-03-19 19:49:48 +08:00
CMK
cac33f9b82
Merge pull request #71 from tootsuite/feature/in-reply-to-header
Add post reply to header
2021-03-19 13:15:07 +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
556964373e chore: code cleanup 2021-03-17 18:17:44 +08:00
CMK
5ecce85bfd feat: add image media attachment item for diffable data source 2021-03-17 18:09:38 +08:00
CMK
221ec27c47 fix: AutoLayout warning for media type indicator view 2021-03-17 18:09:12 +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
sxiaojian88
f3d162b9c7
Merge pull request #70 from tootsuite/feature/timelineGap
feature: Update timeline gap appearance
2021-03-17 16:24:07 +08:00
CMK
ad2da554b5 feat: adapt Dark Mode. Fix bottom loader appearance 2021-03-17 16:16:55 +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
sunxiaojian
c51b2ea5ff Merge branch 'develop' into feature/timelineGap 2021-03-17 11:22:37 +08:00
CMK
20b11e7a18
Merge pull request #34 from tootsuite/feature/welcome-illustration
Add welcome illustration
2021-03-17 10:48:23 +08:00
sunxiaojian
8fc39edd85 feature: Update timeline gap appearance 2021-03-16 19:31:34 +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
c8bcfd1526
Merge pull request #63 from tootsuite/feature/compose
Implement compose scene with basic features
2021-03-16 18:32:24 +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
07f3cc7a77 fix: author info UI layout issue 2021-03-16 16:17:11 +08:00
CMK
96c1488820 fix: hashtag regex exclude list issue 2021-03-16 16:16:44 +08:00
CMK
c5582c7aaf Merge branch /develop into feature/compose
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-03-16 15:59:26 +08:00
sxiaojian88
9e7e042127
Merge pull request #66 from tootsuite/feature/navigationBarState
Feature/navigation bar state
2021-03-16 15:57:43 +08:00
sunxiaojian
12e2c5f0d5 chore: remove newPostsView when load gap toots 2021-03-16 15:54:03 +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
f7b4b5993a fix: tableView can't scrolling to the top 2021-03-16 15:37:21 +08:00
sunxiaojian
27307ed4dd chore: remove newBottomContent logic 2021-03-16 15:12:52 +08:00
sunxiaojian
1abe550745 chore: remove navigationBar newPostsView when loadmore 2021-03-16 14:41:42 +08:00
CMK
fdcd1ffcd0 feat: implement inline emoji for text editor 2021-03-16 14:19:12 +08:00
CMK
21f4124747 fix: header icon missing issue 2021-03-16 11:48:33 +08:00
CMK
1a3cff8a3a chore: add debug entries 2021-03-16 11:48:14 +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
CMK
f69086e6c3 chore: move emoji preload to compose scene 2021-03-16 11:23:34 +08:00
CMK
7705e54e67 chore: renaming 2021-03-16 11:23:19 +08:00
sunxiaojian
50a30cd18e chore: export colors from zeplin 2021-03-16 10:12:03 +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
c15a4a1e89
Merge pull request #52 from tootsuite/feature/reblog
Add boost toot support
2021-03-15 19:31:44 +08:00
CMK
e6b9252e6c chore: remove redundant layout 2021-03-15 19:31:31 +08:00
CMK
1a60428f2a feat: implement emojis preloading logic 2021-03-15 19:25:44 +08:00
CMK
fdf5b5fa66 chore: update i18n 2021-03-15 18:22:44 +08:00
CMK
6eb3816bab chore: renaming reblog 2021-03-15 18:19:45 +08:00
CMK
4005581d24 chore: add Xcode previews 2021-03-15 18:02:42 +08:00
CMK
ea5b05107d fix: add bottom-right corner radius and fix RTL layout issue for media indicator view 2021-03-15 17:59:11 +08:00
CMK
b9cfd0d9e8 chore: remove magic number 2021-03-15 17:54:15 +08:00