diff options
| author | Henry Jameson <me@hjkos.com> | 2019-03-21 22:28:29 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-03-21 22:28:29 +0200 |
| commit | fe13b1b75a42d03a813072633194f89385acec8e (patch) | |
| tree | 04db79c750a98dffa62df7338c82486b971915d2 /src/components/user_settings/user_settings.vue | |
| parent | c038d0c12a8cc2af9fd3d3c6f9e338ee0d7c4765 (diff) | |
| parent | 66e60572bc5f3f35a902417547c1d38e3665fbb7 (diff) | |
Merge remote-tracking branch 'upstream/develop' into mastoapi/friends-tl
* upstream/develop: (47 commits)
#449 - fix auth token fetch issue
Make select tag use --inputText as text color
#444 - remote follow clean up
#444 - show `remote follow` button when logged out
Add button to save without cropping
post-merge fixes
[i18n] Update oc.json
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
...
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
0 files changed, 0 insertions, 0 deletions