zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
6,272 Commits 33 Branches 362 Tags 67 MiB
Commit Graph

168 Commits

Author SHA1 Message Date
sunxiaojian bc588e08db Merge branch 'develop' into feature/notification 2021-04-16 22:40:36 +08:00
sunxiaojian cfdd2ea670 chore: use stackView 2021-04-16 22:31:52 +08:00
CMK 680cf9a827 feat: add blurhash image and update content warning 2021-04-16 20:08:32 +08:00
sunxiaojian ca7eb7bb12 chore: code format 2021-04-16 13:45:54 +08:00
sunxiaojian 80d76acc27 chore: format file 2021-04-15 10:16:30 +08:00
sunxiaojian f3394ff382 feat: add navigation to Notification Cell 2021-04-14 17:48:09 +08:00
CMK 5417e42757 feat: implement thread scene 2021-04-13 19:46:42 +08:00
ihugo 191370e712 feature: settings 2021-04-13 17:15:58 +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 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
CMK 0822b222fc fix: debug running may assert fail issue 2021-04-06 17:48:20 +08:00
CMK 9612cc3902 feat: handle blocking and blocked state for profile 2021-04-06 16:43:08 +08:00
sunxiaojian 608e916320 chore: remove extension from MastodonSDK 2021-04-02 20:45:33 +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
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
jk234ert d548840bd9 feat: implement hashtag timeline 2021-04-01 11:56:50 +08:00
sunxiaojian fde5baad2e chore: add translatesAutoresizingMaskIntoConstraints = false to all constrain method 2021-04-01 10:38:39 +08:00
sunxiaojian dff874af76 feature: add SearchRecommendTagsCollectionViewCell 2021-03-31 20:56:11 +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
sunxiaojian 21362b56c3 chore: add gesture to scroll manually 2021-03-15 20:23:27 +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 71c5ca327a chore: make fetch free from exception 2021-03-11 14:34:10 +08:00
sunxiaojian e1143b0ce4 feature: video & gifv support 2021-03-10 15:06:24 +08:00
sunxiaojian 5a17b8a6ee chore: make slider enable state change with isPlaying 2021-03-09 16:25:47 +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 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 8b63c2fda1 feat: add PollSection and PollItem for diffable data source 2021-03-02 16:27:11 +08:00
CMK fc9310de20 feat: add motion effect for welcome illustration elements 2021-03-02 13:45:47 +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
sunxiaojian 732c5392d4 chore: show error with 18n 2021-03-01 17:16:28 +08:00
CMK bab6832da3 feat: add app version and build infos into system app setting panel 2021-02-26 18:36:38 +08:00
BradGao bcaff23704
Merge branch 'develop' into feat/serverPicker 2021-02-25 14:49:50 +08:00
jk234ert eb7a33932e feat: implement pick server view category select 2021-02-25 14:23:20 +08:00
CMK b2706a50da chore: update sign up alert. Update gitignore for i18n files 2021-02-24 19:08:30 +08:00
CMK 2988e71611 chore: update UI appearance. remove not used separator line component 2021-02-24 18:40:47 +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 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
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
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
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 1c3facf456 feat: display avatar bar button item for authenticated user 2021-02-04 19:37:38 +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 cb2b478bff chore: remove implicit optional unwrap 2021-02-04 14:57:16 +08:00
CMK 2ebb12b86e feat: add APIService.Persist.persistTimeline method and make public timeline load oldest works 2021-02-04 14:45:44 +08:00
CMK 2c6a0e383a feat: implement authentication scene 2021-02-03 16:01:08 +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 24ca4644de status content display 2021-01-29 16:47:32 +08:00
sunxiaojian cb690ffa4e add public timeline 2021-01-28 16:10:30 +08:00
CMK 1a000b96a8 feat: add Core Data Stack 2021-01-27 14:50:13 +08:00