Commit Graph

4154 Commits

Author SHA1 Message Date
sunxiaojian a32cf8c18e chore: use swiftgen from CococaPods 2021-02-25 17:05:19 +08:00
jk234ert b67cb61fd8 chore: fix conflicts 2021-02-25 16:52:41 +08:00
sunxiaojian ed99ca0346 chore: rename script and use swiftgen from CococaPods 2021-02-25 16:50:37 +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
sxiaojian88 fff45370af
Merge pull request #20 from tootsuite/feature/confirmEmail
feat: confirmEmail Page
2021-02-25 16:37:38 +08:00
sunxiaojian 9489fbfa1a chore: change button color to .white 2021-02-25 16:37:25 +08:00
sunxiaojian 74c19c9746 chore: fill email in MastodonResendEmailViewModelNavigationDelegateShim 2021-02-25 16:20:42 +08:00
sunxiaojian fa4b349e06 chore: update generated Strings 2021-02-25 16:04:14 +08:00
sunxiaojian d5dcfca1c3 chore: add script to generate Strings file 2021-02-25 15:46:32 +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 7329a62582 chore: resolve conflicts 2021-02-25 14:41:41 +08:00
CMK 6155b33451
Merge pull request #22 from tootsuite/feature/cw-image-media
Support content warning image media
2021-02-25 14:34:23 +08:00
jk234ert 50035c1359 feat: implement pick server feature 2021-02-25 14:23:51 +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
CMK ccc8741ccd chore: set public timeline title and update loader height 2021-02-25 11:48:16 +08:00
sunxiaojian 35ef867adf chore: add account validation and webView email pre-fill 2021-02-24 20:12:15 +08:00
CMK 0ad43fb0eb chore: update Xcode Preview for StatusView. Rename MosaicImageView to MosaicImageViewContainer 2021-02-24 19:19:16 +08:00
CMK b2706a50da chore: update sign up alert. Update gitignore for i18n files 2021-02-24 19:08:30 +08:00
CMK 10594d1eb6 feat: store view state to prevent redundant image rending 2021-02-24 18:41:40 +08:00
CMK 2988e71611 chore: update UI appearance. remove not used separator line component 2021-02-24 18:40:47 +08:00
CMK 6182390699 fix: expiresAt attribute of Poll entity is not mark optional issue 2021-02-24 18:35:55 +08:00
CMK ca013f79da feat: add public timeline debug entry 2021-02-24 18:07:11 +08:00
CMK 1345db9d7e fix: status content warning UI for Dark Mode related issue 2021-02-24 18:07:00 +08:00
CMK 5bc8adfd43 fix: re-entry crash issue 2021-02-24 17:23:30 +08:00
CMK a79f5140b5 feat: profile timeline scroll performance 2021-02-24 17:23:01 +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 738ba832a9
Merge pull request #21 from tootsuite/feature/home
Update timeline status cell UI
2021-02-24 16:36:13 +08:00
CMK 7e625f74d2 fix: content warning label set when spoiler text is empty issue 2021-02-24 16:18:39 +08:00
CMK 4d2e75f3ca feat: implement content warning dismiss action logic 2021-02-24 16:11:48 +08:00
CMK f455faa273 feat: add content warning (CW) for status text. 2021-02-24 15:29:16 +08:00
sunxiaojian 36e5fa3950 chore: add cancel action to alert 2021-02-24 10:49:50 +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 87a7a1e91f chore: make sign in works 2021-02-23 15:44:59 +08:00
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