1
0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2024-12-12 00:25:36 +01:00
Commit Graph

19 Commits

Author SHA1 Message Date
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
sunxiaojian
85e77150b2 fix: avatar image delete and restore 2021-03-31 10:37:38 +08:00
CMK
df66cc6b4a feat: implement emoji picker 2021-03-25 15:56:17 +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
296d29f3e0 feat: implement status publish API 2021-03-18 17:33:07 +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
97ecbb1bfb feat: add compose scene 2021-03-11 15:41:27 +08:00
sunxiaojian
e1143b0ce4 feature: video & gifv support 2021-03-10 15:06:24 +08:00
sunxiaojian
ea511c153f chore: set user avatar use PhotoUI 2021-03-02 16:19:20 +08:00
sunxiaojian
f5621991d8 feat: confirmEmail Page 2021-02-23 15:42:23 +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
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
7c19e569c9 Add Assets Color
Update public timeline cell's UI
add ActionToolBar
2021-02-02 10:29:48 +08:00
CMK
71de1ed9be feat: add OAuth API endpoint unit test 2021-01-29 19:38:11 +08:00
sunxiaojian
cb690ffa4e add public timeline 2021-01-28 16:10:30 +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