Commit Graph

175 Commits

Author SHA1 Message Date
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 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 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
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
CMK f455faa273 feat: add content warning (CW) for status text. 2021-02-24 15:29:16 +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
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
jk234ert 85ceb48003 chore: resolve requested changes 2021-02-22 23:16:13 +08:00
CMK 9a79b9a545 feat: add MastodonServerRules scene 2021-02-22 16:20:44 +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
jk234ert 8970231381 feat: add welcome view 2021-02-20 13:56:34 +08:00
sunxiaojian 04d4e7f33a feat: add bottomLoader 2021-02-03 17:23:25 +08:00
CMK 19ddb106ad chore: setup project 2021-01-22 14:28:58 +08:00