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

66 Commits

Author SHA1 Message Date
CMK 0eff43e1d1 feat: update compose scene UI appearance 2021-04-14 15:24:54 +08:00
CMK 4faacdf1be feat: implement profile infos editing 2021-04-09 17:31:43 +08:00
CMK 2ce5c4db6b fix: pick server scene leaking issue 2021-04-09 11:05:10 +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
jk234ert a61e662f38 fix: resolve requested changes 2021-04-07 13:57:03 +08:00
CMK 824d214ce7 chore: update color asset 2021-04-06 16:42:45 +08:00
sunxiaojian e1696134a8 Merge branch 'develop' into feature/searchRecommend 2021-04-02 17:04:08 +08:00
sunxiaojian c0bd7c2497 chore: change .black to asset color. 2021-04-02 16:50:07 +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 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 85e77150b2 fix: avatar image delete and restore 2021-03-31 10:37:38 +08:00
jk234ert ed88923901 fix: adjust empty state view horizontal padding 2021-03-29 22:02:27 +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 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 1b3ba1ccfb feat: add pick compose image attachment logic 2021-03-18 15:16:35 +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 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 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 1746c1fc77 feat: add toolbar for compose scene 2021-03-12 15:23:28 +08:00
CMK 75d39aabf0 feat: add reply to header for toot 2021-03-10 19:12:53 +08:00
CMK 1a66ba92c0 feat: add avatar and display name update logic after sign-up flow 2021-03-08 19:05:15 +08:00
CMK c6103eed35 fix: add missing request retry logic 2021-03-06 14:59:27 +08:00
CMK 893dc2a668 feat: make diffable data source works with category picker 2021-03-06 14:46:04 +08:00
CMK 8568debab0 feat: make diffable data source work with search text 2021-03-06 14:21:52 +08:00
CMK 29653ca612 feat: set corner radius for the last cell layer 2021-03-06 13:30:06 +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 087413009d chore: update function signature 2021-03-05 19:30:52 +08:00
CMK 7ad09468e2 fix: set image missing corner radius 2021-03-05 19:30:17 +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 d9428d1f82 Merge commit /develop into fix/html-server-description 2021-03-04 10:49:08 +08:00
sunxiaojian 492ad98d9b chore: change puls.circle.fill 2021-03-03 12:26:14 +08:00
sunxiaojian a0aa8b9194 chore: use instance method to observe highlighted property 2021-03-03 11:30:25 +08:00
sunxiaojian 384fe6018e chore: set the photoButton highlight with some value alpha 2021-03-03 10:59:44 +08:00
sunxiaojian f16b4ed1cb chore: update password hint, handle error when use PhotosUI 2021-03-02 17:24:04 +08:00
sunxiaojian eb2057d14e chore: make sure to crop the image into a square 2021-03-02 16:39:43 +08:00
sunxiaojian 211f5dd0e4 chore: code format 2021-03-02 16:27:58 +08:00
sunxiaojian ea511c153f chore: set user avatar use PhotoUI 2021-03-02 16:19:20 +08:00
CMK fc9310de20 feat: add motion effect for welcome illustration elements 2021-03-02 13:45:47 +08:00
CMK daba138c0e Merge branch 'develop' into feature/welcome-illustration 2021-03-02 12:53:33 +08:00