Commit Graph

4513 Commits

Author SHA1 Message Date
sunxiaojian f5621991d8 feat: confirmEmail Page 2021-02-23 15:42:23 +08:00
CMK e6ad839d3c Merge commit 'ea79ca771d441f1d0af2cd19872e3bdd227838e7' into feature/home
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-02-23 15:25:48 +08:00
CMK a90643552a feat: display count for reply button 2021-02-23 15:23:18 +08:00
CMK 40a524434f feat: update status cell UI 2021-02-23 15:16:55 +08:00
BradGao ea79ca771d
Merge pull request #17 from tootsuite/feat/welcomeView
Feat/welcome view
2021-02-23 12:47:32 +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
sxiaojian88 0ffc0019a4
Merge pull request #16 from tootsuite/feature/signup
feat: finish sign up page
2021-02-23 11:22:15 +08:00
jk234ert 4fafb3835d chore: update constraints 2021-02-23 11:19:10 +08:00
jk234ert 85ceb48003 chore: resolve requested changes 2021-02-22 23:16:13 +08:00
CMK 74b08974fd
Merge pull request #18 from tootsuite/feature/server-rule
Add server rules scene. Update sign up UX
2021-02-22 18:20:01 +08:00
CMK db2761447b chore: remove ignore file 2021-02-22 17:55:43 +08:00
CMK 40a21a3a9f chore: make input responsible 2021-02-22 17:48:44 +08:00
CMK 832432f42f fix: make button display on the top of the keyboard 2021-02-22 16:37:13 +08:00
CMK abf2e673e1 Merge branch 'feature/signup' into feature/server-rule
# Conflicts:
#	Mastodon/Scene/Authentication/Register/MastodonRegisterViewController.swift
2021-02-22 16:26:50 +08:00
CMK 9a79b9a545 feat: add MastodonServerRules scene 2021-02-22 16:20:44 +08:00
CMK 34191c921a feat: add localization helper 2021-02-22 16:20:23 +08:00
sunxiaojian e4989cfe30 chore: add keyboardWillShowNotification to KeyboardResponderService 2021-02-22 12:51:35 +08:00
CMK 8a48eb5847 feat: add rules attribute for Instance entity 2021-02-22 12:26:44 +08:00
jk234ert 9d0c0fae90 chore: apply large title style to slogan title 2021-02-20 21:00:11 +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
CMK 6285cb95fa fix: AutoLayout issue. Update keyboard listener. Expose server error message 2021-02-20 19:54:08 +08:00
sunxiaojian 0e2aa4570d chore: remove useless code 2021-02-20 18:26:39 +08:00
sunxiaojian 243d3362e6 chore: add Combine style valid logic 2021-02-20 18:24:23 +08:00
CMK a74ac3a41a chore: add Combine style valid logic 2021-02-20 17:13:16 +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
BradGao c827d7630b
Merge pull request #15 from tootsuite/colors
chore: export Colors from Zeplin
2021-02-20 13:47:59 +08:00
sunxiaojian efc2a05db1 chore: export Colors from Zeplin 2021-02-20 11:14:13 +08:00
BradGao 773a25e94a
Merge pull request #13 from tootsuite/feat/mastodonSDKRefactor
Feat/mastodon sdk refactor
2021-02-19 21:33:33 +08:00
jk234ert 4c36d0e12d fix: accountsInfo url 2021-02-19 21:32:41 +08:00
CMK cd8c461f87
Merge pull request #14 from tootsuite/feature/server-index
Add onboarding endpoint
2021-02-19 17:46:44 +08:00
jk234ert e44821bce8 feat: refactor the mastodonSDK
chore: update API docs
2021-02-19 17:40:05 +08:00
CMK f98b1f6e9b
chore: mark proxiedThumbnail optional 2021-02-19 17:13:33 +08:00
CMK 912b6c021f
chore: remove version
Co-authored-by: BradGao <ugling88@hotmail.com>
2021-02-19 17:12:00 +08:00
CMK 4036cd870b
chore: remove version
Co-authored-by: BradGao <ugling88@hotmail.com>
2021-02-19 17:09:17 +08:00
CMK b0b1e48b76 chore: remove blank line 2021-02-19 12:22:49 +08:00
CMK 9e0a7bb352 feat: add stub categories 2021-02-19 12:17:12 +08:00
CMK c919a724ab feat: implement onboarding /servers and /categories endpoint 2021-02-19 11:56:51 +08:00
jk234ert 2a84275288 fix: source in CredentialQuery 2021-02-18 23:17:28 +08:00
CMK 587d16a829 feat: add servers & categories API 2021-02-18 19:36:49 +08:00
sxiaojian88 aa6d59fd98
Merge pull request #10 from tootsuite/feature/homeTimeline
feat: HomeTimeline
2021-02-18 14:35:47 +08:00
sunxiaojian 9670ad2924 chore: update toot relationship in CoreData 2021-02-18 14:32:29 +08:00
sunxiaojian 99f2e4a854 chore: code format and define onceRequestTootMaxCount 2021-02-18 13:09:40 +08:00
jk234ert 9395f689ce feat: refactor query type; add several Account APIs and tests 2021-02-10 14:56:16 +08:00
sunxiaojian b55790fee8 feat: finish user favourite action 2021-02-08 18:29:27 +08:00
sunxiaojian 5f1800b353 feat: HomeTimeline 2021-02-07 16:19:33 +08:00
CMK 71a485fc4a
Merge pull request #9 from tootsuite/feature/sign-up into /develop
Add sign up scene
2021-02-05 18:19:09 +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
CMK 7d1c8e5be9 feat: [WIP] implement sign up scene 2021-02-05 17:53:00 +08:00