zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
3,019 Commits 33 Branches 360 Tags 66 MiB
Commit Graph

279 Commits

Author SHA1 Message Date
CMK 0eff43e1d1 feat: update compose scene UI appearance 2021-04-14 15:24:54 +08:00
sunxiaojian 42628398e6 chore: display Notification Cell 2021-04-13 21:31:49 +08:00
sunxiaojian 773bfb6dd2 feature: notification API and CoreData 2021-04-13 19:56:35 +08:00
CMK fccf9ee080 Merge branch 'develop' into feature/post-thread 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-04-13 19:48:13 +08:00
CMK 5417e42757 feat: implement thread scene 2021-04-13 19:46:42 +08:00
ihugo 16fc1a85bd fix: fix some reveiw issues 2021-04-13 17:18:04 +08:00
ihugo 6f8b71f25f chore: remove .lock file 2021-04-13 17:15:58 +08:00
ihugo 191370e712 feature: settings 2021-04-13 17:15:58 +08:00
sunxiaojian a59208a643 Merge branch 'develop' into feature/searching 2021-04-13 09:43:54 +08:00
sunxiaojian a007b7a980 fix: color in Light Mode, fix search result disappear when push new page 2021-04-09 20:38:02 +08:00
CMK ff13121b18 feat: add title view for profile scene 2021-04-09 19:44:48 +08:00
CMK 4faacdf1be feat: implement profile infos editing 2021-04-09 17:31:43 +08:00
CMK 3b03ed63ce feat: add share action for profile scene 2021-04-08 18:52:35 +08:00
CMK 14176be4ed feat: handle suspended account in profile scene 2021-04-08 17:06:03 +08:00
CMK a0a636917f feat: add title view for favorite scene 2021-04-08 17:06:02 +08:00
sunxiaojian 4ffea58f71 fix: SearchCard UI update, change follow button border width, add card border when DarkMode, add shadow 2021-04-08 13:51:25 +08:00
sunxiaojian 27b698a97a chore: add backgroud.navigation.color. update colors in searching page 2021-04-07 21:42:43 +08:00
sunxiaojian c7eea5d8e6 Merge branch 'develop' into feature/searching 2021-04-07 21:08:41 +08:00
sunxiaojian 33016d9cf4 chore: rename hashTag to hashtag 2021-04-07 21:01:32 +08:00
CMK fbe3a8c419 Merge branch 'develop' into feature/profile-coordinator 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Coordinator/SceneCoordinator.swift
#	Mastodon/Scene/Share/View/Content/StatusView.swift
#	Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift
 2021-04-07 16:55:07 +08:00
BradGao 502ceeabe2
Merge pull request #89 from tootsuite/feat/hastagTimeline 
Feat/hastag timeline
 2021-04-07 16:38:08 +08:00
CMK af4fcf9dfd Merge branch 'develop' into feature/profile-coordinator 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-04-07 14:44:58 +08:00
sunxiaojian 6e10efc490 feature:searching page 
feature: searching Page
 2021-04-07 11:21:56 +08:00
CMK 021d6036cd chore: update dark mode color for background. Make blocking high priority then blocked 2021-04-06 17:12:25 +08:00
CMK 9612cc3902 feat: handle blocking and blocked state for profile 2021-04-06 16:43:08 +08:00
CMK 824d214ce7 chore: update color asset 2021-04-06 16:42:45 +08:00
CMK 5d3b6d1943 feat: handle profile follow, block, and mute actions 2021-04-02 18:13:45 +08:00
sunxiaojian e1696134a8 Merge branch 'develop' into feature/searchRecommend 2021-04-02 17:04:08 +08:00
BradGao f40f62e573
Merge branch 'develop' into feat/hastagTimeline 2021-04-02 16:50:31 +08:00
sunxiaojian 458ab6bcda feature: search recommend page 2021-04-02 11:48:22 +08:00
jk234ert b63a5ebe5f feat: use search api to fetch tag info 2021-04-02 10:21:51 +08:00
CMK bd89b19724 Merge branch 'develop' into feature/profile 2021-04-01 16:01:24 +08:00
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
sunxiaojian 0584576055 fix: Update server rules scene UI design 2021-04-01 14:40:58 +08:00
CMK 43ee11b863 feat: [WIP] add profile scene 2021-04-01 14:39:15 +08:00
sxiaojian88 379884b001
Merge pull request #84 from tootsuite/feature/searchAPI 
Feature/search api
 2021-04-01 11:52:17 +08:00
sxiaojian88 21b50da2bf
Merge pull request #76 from tootsuite/feature/avatarSelect 
feature: Add context menu for avatar select for sign up page
 2021-04-01 09:59:55 +08:00
sunxiaojian 09320bf99c chore: add api to APIService 2021-03-31 19:30:21 +08:00
CMK e3fa472f3f feat: implement post publishing progress bar UI and publish failure retry logic 2021-03-29 17:44:52 +08:00
sunxiaojian ca25d43f4f feature: Add context menu for avatar select for sign up page 2021-03-29 13:37:56 +08:00
CMK 87a6a4df77 feat: add counter and emoji picker activity indicator 2021-03-26 19:16:32 +08:00
CMK 00e7450bcc feat: add status visibility selector for status compose scene 2021-03-25 19:34:30 +08:00
CMK 610ee36835 feat: add content warning editor for status compose scene 2021-03-25 18:17:05 +08:00
CMK d05f97951b feat: add expires duration selector for poll 2021-03-24 14:49:27 +08:00
CMK b8e062c92e feat: add poll UI/UX for compose scene 2021-03-23 18:47:21 +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 36b42ba3e7 feat: implement take photo and browser for image for compose scene 2021-03-19 19:49:48 +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 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
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
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 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
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 50a30cd18e chore: export colors from zeplin 2021-03-16 10:12:03 +08:00
sunxiaojian 0b046e4673 feature: add navigationBar state 2021-03-15 20:03:48 +08:00
CMK fdf5b5fa66 chore: update i18n 2021-03-15 18:22:44 +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 8c48bce627 chore: rename toot 2021-03-15 13:42:46 +08:00
CMK 36604d150f feat: show discard alert when user cancel toot composing 2021-03-12 15:57:58 +08:00
sunxiaojian 6b5edff677 chore: add media type with gif and video 2021-03-12 15:41:57 +08:00
CMK d9e2453464 feat: make text editor automatic grow height during input 2021-03-12 14:18:07 +08:00
CMK 97ecbb1bfb feat: add compose scene 2021-03-11 15:41:27 +08:00
CMK 75d39aabf0 feat: add reply to header for toot 2021-03-10 19:12:53 +08:00
CMK 2ac2eb7c77 Merge commit /develop into feature/reblog 2021-03-10 10:30:07 +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 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 e70fd532c4 feat: [WIP] display empty state when fetching server list 2021-03-06 12:55:52 +08:00
CMK a3f9b8c2ef Merge branch 'develop' into feature/poll 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-05 15:55:29 +08:00
CMK 06aac878c8 feat: [WIP] make the vote poll logic works 2021-03-04 18:53:29 +08:00
CMK 54292d6b6a fix: typo. Remove period 2021-03-04 16:42:43 +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 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
sunxiaojian 492ad98d9b chore: change puls.circle.fill 2021-03-03 12:26:14 +08:00
CMK 376cb3d58a feat: display toot poll status 2021-03-02 19:33:33 +08:00
sunxiaojian f16b4ed1cb chore: update password hint, handle error when use PhotosUI 2021-03-02 17:24:04 +08:00
sunxiaojian ea511c153f chore: set user avatar use PhotoUI 2021-03-02 16:19:20 +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 148a996129 chore: update the i18n suggests 2021-03-01 19:19:51 +08:00
CMK 47abbadaba feat: draw welcome illustration 2021-03-01 17:38:45 +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 d57d30ac21 chore: set AppIcon and update version to 0.1.0 (2) 2021-02-26 19:32:25 +08:00
CMK 7aa45ff230 chore: make onboarding ready 2021-02-26 18:27:47 +08:00
CMK 24fc57d982 Merge branch 'develop' into feature/onborading 2021-02-26 16:44:28 +08:00
CMK ccf599feaa chore: make UI appearance match between onboarding scenes 2021-02-26 16:43:59 +08:00
sunxiaojian 522702386c feat: add support for inviteEnabled instance 2021-02-26 12:52:37 +08:00
BradGao c9a63a9069
Merge branch 'develop' into feat/serverPicker 2021-02-25 17:59:43 +08:00
jk234ert ec96690ac9 Merge branch 'feat/serverPicker' of https://github.com/tootsuite/mastodon-ios into feat/serverPicker 2021-02-25 16:41:41 +08:00
jk234ert 8476fc0e38 feat: resolve requested changes 2021-02-25 16:38:24 +08:00
sunxiaojian fa4b349e06 chore: update generated Strings 2021-02-25 16:04:14 +08:00
sunxiaojian 5fbb47470c chore: update generated Strings 2021-02-25 15:44:14 +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
CMK 414aa086b4 feat: implement image media content warning overlay 2021-02-25 13:47:30 +08:00
sunxiaojian 35ef867adf chore: add account validation and webView email pre-fill 2021-02-24 20:12:15 +08:00
CMK b2706a50da chore: update sign up alert. Update gitignore for i18n files 2021-02-24 19:08:30 +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 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
jk234ert 2fa11b6595 chore: resolve conflicts 2021-02-23 12:41:56 +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 40a21a3a9f chore: make input responsible 2021-02-22 17:48:44 +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
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
sunxiaojian efc2a05db1 chore: export Colors from Zeplin 2021-02-20 11:14:13 +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
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
sunxiaojian 04d4e7f33a feat: add bottomLoader 2021-02-03 17:23:25 +08:00
sunxiaojian 7c19e569c9 Add Assets Color 
Update public timeline cell's UI
add ActionToolBar
 2021-02-02 10:29:48 +08:00
CMK 19ddb106ad chore: setup project 2021-01-22 14:28:58 +08:00