Commit Graph

26 Commits

Author SHA1 Message Date
BradGao f40f62e573
Merge branch 'develop' into feat/hastagTimeline 2021-04-02 16:50:31 +08:00
CMK bd89b19724 Merge branch 'develop' into feature/profile 2021-04-01 16:01: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
jk234ert d548840bd9 feat: implement hashtag timeline 2021-04-01 11:56:50 +08:00
CMK 0b1b3ecbbd Merge branch 'develop' into feature/welcome-illustration
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
2021-03-16 19:01:41 +08:00
CMK f0b08e2b56 Merge branch 'develop' into feature/welcome-illustration
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
#	Mastodon/Extension/MastodonSDK/Mastodon+Entidy+ErrorDetailReason.swift
2021-03-16 15:42:15 +08:00
CMK 97ecbb1bfb feat: add compose scene 2021-03-11 15:41:27 +08:00
CMK 7aa45ff230 chore: make onboarding ready 2021-02-26 18:27:47 +08:00
BradGao c9a63a9069
Merge branch 'develop' into feat/serverPicker 2021-02-25 17:59:43 +08:00
sunxiaojian bf1a709548 Merge branch 'develop' into feature/confirmEmail 2021-02-25 15:41:13 +08:00
BradGao bcaff23704
Merge branch 'develop' into feat/serverPicker 2021-02-25 14:49:50 +08:00
jk234ert eb7a33932e feat: implement pick server view category select 2021-02-25 14:23:20 +08:00
sunxiaojian 35ef867adf chore: add account validation and webView email pre-fill 2021-02-24 20:12:15 +08:00
CMK ca013f79da feat: add public timeline debug entry 2021-02-24 18:07:11 +08:00
sunxiaojian 2f053ee323 Merge branch 'develop' into feature/confirmEmail 2021-02-24 17:19:33 +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
BradGao 8f5a52333a
Merge branch 'develop' into feat/welcomeView 2021-02-23 12:39:55 +08:00
CMK 9a79b9a545 feat: add MastodonServerRules scene 2021-02-22 16:20:44 +08:00
jk234ert 8970231381 feat: add welcome view 2021-02-20 13:56:34 +08:00
CMK 7d1c8e5be9 feat: [WIP] implement sign up scene 2021-02-05 17:53:00 +08:00
CMK 2c6a0e383a feat: implement authentication scene 2021-02-03 16:01:08 +08:00
CMK 36c1807182 feat: [WIP] add authentication scene 2021-02-02 19:31:10 +08:00
CMK 0f8ad0c444 feat: add authentication scene 2021-02-02 15:38:54 +08:00
CMK 1a000b96a8 feat: add Core Data Stack 2021-01-27 14:50:13 +08:00