zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity
417 Commits 35 Branches 74 Tags 62 MiB
Commit Graph

417 Commits

Author SHA1 Message Date
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
CMK 5b45224f7b feat: make media indicator view hide when playing video 2021-03-15 17:53:06 +08:00
CMK 6a8dee037f fix: media not response for reblog issue 2021-03-15 17:52:28 +08:00
CMK 988723691e fix: content warning overlay invalid due to cell reuse issue 2021-03-15 16:28:42 +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
sxiaojian88 a75f2e1889
Merge pull request #54 from tootsuite/feature/gifVideoSupport 
chore: the play interrupts event could be sent with the notification
 2021-03-15 15:09:44 +08:00
sunxiaojian 20283d1878 chore: change video and audio notification string 2021-03-15 15:08:58 +08:00
CMK 9f02197873 feat: add custom emojis API endpoint 2021-03-15 14:40:10 +08:00
CMK 8eb24871c5 feat: add URL highlight for text editor 2021-03-15 13:44:42 +08:00
CMK a6e4b0bfb1 feat: set compose text editor keyboard type to supports @/# glyphs 2021-03-15 13:44:29 +08:00
CMK 6882788ccc fix: AutoLayout fail before view appear issue 2021-03-15 13:43:15 +08:00
CMK 8c48bce627 chore: rename toot 2021-03-15 13:42:46 +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 36604d150f feat: show discard alert when user cancel toot composing 2021-03-12 15:57:58 +08:00
sunxiaojian 0c164a170c chore: use rounded font 2021-03-12 15:53:19 +08:00
sunxiaojian 6b5edff677 chore: add media type with gif and video 2021-03-12 15:41:57 +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
sunxiaojian 2e31280819 chore: extract the common blur effect part from MosaicImageViewContainer 2021-03-12 12:17:07 +08:00
CMK 37db8784bd
Merge pull request #62 from tootsuite/feature/gifVideoSupport-patch 
Patch for delegate chain
 2021-03-12 10:20:19 +08:00
CMK 2b2759c2cc feat: let text editor become first responder when compose scene appear 2021-03-11 19:26:10 +08:00
CMK 03496a4e97 chore: add missing renaming 2021-03-11 19:23:44 +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 1342471c5d chore: handle Video&Gif sensitive situation 2021-03-11 15:34:30 +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