diff options
| author | Henry Jameson <me@hjkos.com> | 2018-12-13 17:11:22 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-12-13 17:11:22 +0300 |
| commit | fa7c3c20970f8a31e064d5591b9e0814a5cf1512 (patch) | |
| tree | ef483d25e542b7c3a2446bafed582abfdaded2b7 /src/components/user_settings/user_settings.vue | |
| parent | 42bb34821908430cdfdbad827567049e3bf22b22 (diff) | |
| parent | 8e4777ccc6bf72b56a0905ca491c8e0e97fb73cf (diff) | |
Merge remote-tracking branch 'upstream/develop' into fix_empty_profiles
* upstream/develop: (121 commits)
improve notification subscription
Fix typo that prevented scope copy from working.
added check for activatePanel is function or not
addressed PR comments
activate panel on user screen click
added not preload check so hidden toggles asap
removed counters from left panel
added router-links to all relavent links
added activatePanel onclick for timeago button
added PR comments
add checkbox to disable web push
removed brackets from condition
resolved lint issue
renamed config to preload images and add ident to config
added config for preload and made attachment responsive to it
preload nsfw image
fix
fixed wrong height for selects
better layouting for import-export, error display fixes
added keep-colors option
...
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
0 files changed, 0 insertions, 0 deletions