zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity
4,513 Commits 33 Branches 82 Tags 62 MiB
Commit Graph

2685 Commits

Author SHA1 Message Date
Eugen Rochko 16a1382b16 New translations ios-infoPlist.json (German) 2021-08-03 00:34:20 +02:00
Eugen Rochko e6714beecc New translations ios-infoPlist.json (Portuguese) 2021-08-03 00:34:20 +02:00
Eugen Rochko a71914e723 New translations ios-infoPlist.json (Russian) 2021-08-03 00:34:19 +02:00
Eugen Rochko acefc49835 New translations ios-infoPlist.json (Portuguese, Brazilian) 2021-08-03 00:34:18 +02:00
Eugen Rochko 5211289f61 New translations app.json (Spanish) 2021-08-03 00:34:17 +02:00
Eugen Rochko 87840d264b New translations Intents.strings (French) 2021-08-03 00:34:16 +02:00
Eugen Rochko fecbc00afd New translations Intents.strings (German) 2021-08-03 00:34:15 +02:00
Eugen Rochko 47fbb7979c New translations Intents.strings (Portuguese) 2021-08-03 00:34:13 +02:00
Eugen Rochko b7a033cfc6 New translations Intents.strings (Russian) 2021-08-03 00:34:12 +02:00
Eugen Rochko 02aba9da09 New translations Intents.strings (Portuguese, Brazilian) 2021-08-03 00:34:11 +02:00
Eugen Rochko de653b5927 New translations app.json (Hindi) 2021-08-03 00:34:11 +02:00
Eugen Rochko 2b44d29bbc New translations ios-infoPlist.json (Hindi) 2021-08-03 00:34:10 +02:00
Eugen Rochko f05f8367df New translations Intents.strings (Hindi) 2021-08-03 00:34:09 +02:00
Eugen Rochko 849b17d837 New translations app.json (Welsh) 2021-08-03 00:34:08 +02:00
Eugen Rochko faa6c0da01 New translations ios-infoPlist.json (Welsh) 2021-08-03 00:34:07 +02:00
Eugen Rochko d9cb30a637 New translations Intents.strings (Spanish) 2021-08-03 00:34:06 +02:00
Eugen Rochko c4ccaba784 New translations app.json (French) 2021-08-03 00:34:05 +02:00
Eugen Rochko 1d244c19e6 New translations Intents.strings (Spanish, Argentina) 2021-08-02 14:52:45 +02:00
Eugen Rochko 30671ee3ef New translations Intents.strings (Chinese Simplified) 2021-08-02 14:52:44 +02:00
Eugen Rochko 80204001b0 New translations Intents.strings (Japanese) 2021-08-02 14:52:43 +02:00
Eugen Rochko 8f3bd44404 New translations ios-infoPlist.json (Spanish, Argentina) 2021-08-02 14:52:42 +02:00
Eugen Rochko 32d81cec65 New translations app.json (Spanish, Argentina) 2021-08-02 14:52:42 +02:00
Eugen Rochko 5e65cd8f72 New translations app.json (Spanish, Argentina) 2021-08-02 13:46:46 +02:00
Eugen Rochko 5ffab1ad15 New translations ios-infoPlist.json (Spanish, Argentina) 2021-08-02 13:29:35 +02:00
Eugen Rochko 1759c7ec59 New translations app.json (Spanish, Argentina) 2021-08-02 13:29:33 +02:00
Eugen Rochko b1b5dba1a8 New translations ios-infoPlist.json (Chinese Simplified) 2021-08-02 13:29:32 +02:00
Eugen Rochko 59db310f65 New translations ios-infoPlist.json (Japanese) 2021-08-02 13:29:31 +02:00
Eugen Rochko 067e649d51 New translations app.json (Chinese Simplified) 2021-08-02 13:29:30 +02:00
Eugen Rochko 9c2c996e16 New translations app.json (Japanese) 2021-08-02 13:29:29 +02:00
CMK bccdb66023 chore: update README 2021-08-02 19:26:39 +08:00
Eugen Rochko 4264daaed9 New translations ios-infoPlist.json (Japanese) 2021-08-02 11:06:10 +02:00
Eugen Rochko 8d3889a55a New translations app.json (Japanese) 2021-08-02 11:06:09 +02:00
CMK 5add231379 chore: update i18n and version to 1.0.0 (49) 2021-07-28 11:05:28 +08:00
CMK b07a6f8ba9 feat: add compose and search home screen quick actions 2021-07-26 17:41:00 +08:00
CMK fff4f0a204 feat: add emoji animation preference 2021-07-23 19:33:05 +08:00
CMK 7b8500e120 feat: set theme color for share action extension 2021-07-20 19:24:24 +08:00
CMK d2f9828f50 feat: complete upload and publish logic 2021-07-20 16:40:04 +08:00
CMK a84f213b20 chore: update i18n string 2021-07-15 21:04:31 +08:00
CMK 0ede1bfee8 Merge branch 'fix-strings' into fix/search 
# Conflicts:
#	Mastodon/Resources/en.lproj/Localizable.strings
 2021-07-15 21:01:47 +08:00
CMK acc24b7ef5 feat: add not result hint for search. fix: user timeline loader spinner not stop issue 2021-07-15 17:26:04 +08:00
CMK 8d4752d71f feat: [WIP] add search result list for scopes searching 2021-07-14 20:28:41 +08:00
CMK f265e988e7 feat: add account settings entry in settings scene 2021-07-13 17:39:38 +08:00
CMK 0dacea6326 feat: add filter for status 2021-07-09 19:07:12 +08:00
CMK 5fa78394a3 feat: add "Using default browser open link" preference option. ticket: #20625EEA 2021-07-08 15:58:11 +08:00
CMK e192bf40e2 fix: i18n string not follow design issue. ticket: #18624SLP 2021-07-07 20:16:37 +08:00
CMK 13a1194a59 feat: add "Disable avatar animation" preference 2021-07-07 14:55:41 +08:00
CMK 66de0593df feat: add copy photo action for status 2021-07-06 19:53:47 +08:00
CMK 1214180c55 fix: hard code instance version tag issue. resolve #203 2021-07-06 15:20:32 +08:00
CMK 0ef3c0f7c8 fix: i18n string plural issue 2021-07-06 14:55:24 +08:00
CMK d03d39a14d feat: add theme 2021-07-05 20:21:11 +08:00
CMK 747becda79 fix: profile fields edit using wrong material issue 2021-06-24 19:20:41 +08:00
CMK 36fdef15df fix: wrong i18n string symbol issue 2021-06-24 16:49:34 +08:00
CMK 4af2c0ca78 fix: profile block state i18n strings not set with name issue. resolve #171 2021-06-24 14:32:01 +08:00
CMK 51c29fa564 fix: toggle content overlay not works for reblog issue. Update content overlay UI 2021-06-23 20:47:49 +08:00
CMK 5ae2474b30 fix: typo 2021-06-22 20:54:34 +08:00
CMK 4bee550f83 fix: "Edit info" wrong i18n string issue in profile scene 2021-06-22 19:37:34 +08:00
CMK a23fc3cab8 fix: "clear" button wrong i18n string issue in searching scene 2021-06-22 17:47:21 +08:00
CMK f826cacccf fix: add interact hint label and separator line for emoji auto complete in compose scene 2021-06-21 18:30:24 +08:00
CMK 2c2aa127bf fix: wrong apostrophe for i18n issue 2021-06-21 17:52:38 +08:00
CMK cd31d79357 fix: add missing "ago" for timestamp 2021-06-17 14:19:43 +08:00
CMK 8b94102289 feat: update status timestamp behavior. resolve #82 2021-06-01 14:31:31 +08:00
CMK 70b75c8eba feat: display clean cache result 2021-06-01 14:07:44 +08:00
CMK a9744146ce feat: add video attachment post supports 2021-05-31 16:42:49 +08:00
CMK b15974dcfb feat: add profile field and update ActiveLabel entity supports 2021-05-27 13:56:55 +08:00
CMK 0bcfc14aa6 feat: add keyboard shortcuts for compose scene 2021-05-21 19:12:01 +08:00
CMK 443c863465 feat: add segment control shortcut for profile scene 2021-05-21 17:42:14 +08:00
CMK 611d65dd30 feat: add segmented control keyboard shortcut for notification scene 2021-05-21 17:18:03 +08:00
CMK aec7a1f5ea feat: add navigation shortcut for notification scene 2021-05-21 16:52:47 +08:00
CMK c44ced7501 feat: add keyboard navigate for timeline 2021-05-21 15:23:02 +08:00
CMK 5c6618f13e feat: add keyboard shortcuts for settings and favorites 2021-05-19 16:45:01 +08:00
CMK 5cbfa28b93 feat: add keyboard shortcuts for tabs 2021-05-19 15:15:19 +08:00
CMK 3927f1630a feat: implement auto complete for emoji/hashtag/mention 2021-05-18 14:25:32 +08:00
CMK 46baa59d37 feat: add picker server loader. Set chevron image for expand button 2021-05-13 17:50:37 +08:00
CMK d8ce63df80 chore: update i18n. resolve #94 2021-05-13 16:06:28 +08:00
CMK 78eaf226a4 chore: add ar language code supports 2021-05-13 14:46:40 +08:00
CMK ec2be58952 feat: add accessibility supports for compose scene 2021-05-13 14:27:57 +08:00
CMK 6ba6598b96 feat: add accessibility supports for timeline 2021-05-12 18:26:53 +08:00
CMK 36273467c1 Merge branch 'develop' into release/0.4.0 
# Conflicts:
#	Mastodon/Scene/Share/View/Content/StatusView.swift
 2021-05-10 18:54:08 +08:00
sunxiaojian 505c251b37 fix: move message to title 2021-05-10 15:40:46 +08:00
sunxiaojian d3256f3171 fix: delete reblogFrom inNotifications poll pollOption when delete status 2021-05-07 20:36:31 +08:00
CMK b63ae6800b feat: add a11y for server category picker 2021-05-07 20:02:28 +08:00
sunxiaojian 5278002c15 feat: Add post delete action entry for user posts 2021-05-07 16:08:07 +08:00
sunxiaojian b8f3f4c886 fix: remove ActionToolbarContainer.moreButtonDidPressed 2021-05-06 18:19:24 +08:00
sunxiaojian 5f921c1537 Merge branch 'develop' into feature/statusMenu 2021-05-06 16:31:34 +08:00
CMK 51c01066d3 feat: add photo library permission checking 2021-05-06 15:05:24 +08:00
sunxiaojian 514e5b0443 chore: remove useless change 2021-04-30 15:38:15 +08:00
sunxiaojian 0403cc0109 Merge branch 'develop' into feature/statusMenu 2021-04-30 12:57:43 +08:00
sunxiaojian 33401b4e1f feature: finish domainBlock action and domainUnblick action 2021-04-30 12:53:25 +08:00
sunxiaojian ccdc48add1 feature: blockDomain 2021-04-29 17:01:36 +08:00
sunxiaojian 211e2f25d5 chore: add share post 2021-04-29 11:03:21 +08:00
sxiaojian88 ee5e2bde1f
Merge branch 'develop' into feature/followrequest 2021-04-27 19:43:47 +08:00
Hugo 2e8183adc6
Merge pull request #111 from tootsuite/feature/report 
Feature/report
 2021-04-27 17:53:20 +08:00
sunxiaojian 42f63808df feature: add follow request notification 2021-04-27 14:27:27 +08:00
sunxiaojian dcb1bb7053 fix: change delete to Delete, set deleteAction attributes: [.destructive] 2021-04-26 20:36:59 +08:00
ihugo 36a6b8b8cc Merge branch 'develop' into feature/report 
# Conflicts:
#	Localization/app.json
 2021-04-26 17:53:38 +08:00
ihugo ad8df6813f fix: add entries for the reporting 2021-04-26 16:34:05 +08:00
sxiaojian88 bcdb55f9f0
Merge pull request #110 from tootsuite/feature/suggestion 
Feature/suggestion
 2021-04-23 04:49:06 -07:00
ihugo 3810588abb chor: restyle localized string 2021-04-22 22:58:21 +08:00
ihugo 23d9853a71 Merge branch 'develop' into feature/report 
# Conflicts:
#	CoreDataStack/Entity/Status.swift
 2021-04-22 12:54:16 +08:00
ihugo e3df692c3f feat: report 2021-04-22 12:52:11 +08:00
sunxiaojian c8474c6a7f feature: suggestion account scene 2021-04-21 16:17:42 +08:00
sunxiaojian e7cd130bf1 fix: L18n repair 2021-04-20 16:46:04 +08:00
CMK f8127428dd Merge branch 'develop' into feature/content-warning 
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
 2021-04-19 19:32:16 +08:00
sunxiaojian bd9860b792 Merge branch 'develop' into feature/notification 2021-04-19 18:07:21 +08:00
ihugo f6dabb5e36 Merge branch 'develop' into feature/settings-rebase 
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Localization/app.json
#	Mastodon/Generated/Assets.swift
#	Mastodon/Generated/Strings.swift
#	Mastodon/Resources/en.lproj/Localizable.strings
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
 2021-04-17 14:13:01 +08:00
sunxiaojian bc588e08db Merge branch 'develop' into feature/notification 2021-04-16 22:40:36 +08:00
CMK 680cf9a827 feat: add blurhash image and update content warning 2021-04-16 20:08:32 +08:00
CMK 0eff43e1d1 feat: update compose scene UI appearance 2021-04-14 15:24:54 +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
sunxiaojian a59208a643 Merge branch 'develop' into feature/searching 2021-04-13 09:43:54 +08:00
CMK ff13121b18 feat: add title view for profile scene 2021-04-09 19:44:48 +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 c7eea5d8e6 Merge branch 'develop' into feature/searching 2021-04-07 21:08:41 +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 9612cc3902 feat: handle blocking and blocked state for profile 2021-04-06 16:43:08 +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 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 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 8fc39edd85 feature: Update timeline gap appearance 2021-03-16 19:31:34 +08:00
CMK c5582c7aaf Merge branch /develop into feature/compose 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-03-16 15:59:26 +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
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 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
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 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
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 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 7aa45ff230 chore: make onboarding ready 2021-02-26 18:27:47 +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 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
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
sunxiaojian 2f053ee323 Merge branch 'develop' into feature/confirmEmail 2021-02-24 17:19:33 +08:00
sunxiaojian 405958768b chore: edit app.json 2021-02-24 17:18:41 +08:00
CMK f455faa273 feat: add content warning (CW) for status text. 2021-02-24 15:29:16 +08:00
CMK 40a524434f feat: update status cell UI 2021-02-23 15:16:55 +08:00
CMK 34191c921a feat: add localization helper 2021-02-22 16:20:23 +08:00