Commit Graph

139 Commits

Author SHA1 Message Date
jk234ert b67cb61fd8 chore: fix conflicts 2021-02-25 16:52:41 +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
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
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
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
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
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