Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (38 commits) Feature/bigger icons for mobile / #211 Fix oauth url clean up the unused stuff Make user profile page cleaner missing string and unification with counters (order) collateral fix for tab display collateral fixes for user-card: use still-image, styles for custom emoji Refactor follower/friends out of statuses/timeline into user_profile where it belongs. Changed display of profile to single panel with tabs. Redirect to /main/all Move userProfile link to methods Fix user profile test Add temporary redirects Add local profile test Fix style Add a way to get new captcha on click Fix style Separate captcha into the backendInteractor more visual fixes changed bottom-shadow hiding method to be more compatible with overflow small fix for overflowing tab-switcher ...
This commit is contained in:
commit
43857d7b13
50 changed files with 2047 additions and 919 deletions
|
|
@ -5,8 +5,8 @@
|
|||
"logo": "/static/logo.svg",
|
||||
"logoMask": true,
|
||||
"logoMargin": ".1em",
|
||||
"redirectRootNoLogin": "/main/all",
|
||||
"redirectRootLogin": "/main/friends",
|
||||
"redirectRootNoLogin": "/~/main/all",
|
||||
"redirectRootLogin": "/~/main/friends",
|
||||
"chatDisabled": false,
|
||||
"showInstanceSpecificPanel": false,
|
||||
"scopeOptionsEnabled": false,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue