Merge branch 'settings-modal' into shigusegubu
* settings-modal: remove timeout, was meant for testing fix tests. user-profile didn't have tab-switcher compnent imported!! fix cursor on desktop, add modal link on mobile Improve settings-modal async loading, update vue to 2.6.11 to be able to use Vue.observable, to implmement resettable async component icons update scroll to top when switching tabs added "settings saved" notice back eslint --fix + small fix cleanup split modal's content into another component, add lazy loading misc fixes Multiple fixes for CSS, added proper auth checking moved stuff from settings, cleaned up naming for tabs, added close and peek initial work on settings modal
This commit is contained in:
commit
721fde9f3f
63 changed files with 2505 additions and 1871 deletions
|
|
@ -60,6 +60,7 @@
|
|||
"submit": "Submit",
|
||||
"more": "More",
|
||||
"generic_error": "An error occured",
|
||||
"error_retry": "Please try again",
|
||||
"optional": "optional",
|
||||
"show_more": "Show more",
|
||||
"show_less": "Show less",
|
||||
|
|
@ -68,7 +69,9 @@
|
|||
"disable": "Disable",
|
||||
"enable": "Enable",
|
||||
"confirm": "Confirm",
|
||||
"verify": "Verify"
|
||||
"verify": "Verify",
|
||||
"close": "Close",
|
||||
"peek": "Peek"
|
||||
},
|
||||
"image_cropper": {
|
||||
"crop_picture": "Crop picture",
|
||||
|
|
@ -278,6 +281,7 @@
|
|||
"current_avatar": "Your current avatar",
|
||||
"current_password": "Current password",
|
||||
"current_profile_banner": "Your current profile banner",
|
||||
"mutes_and_blocks": "Mutes and Blocks",
|
||||
"data_import_export_tab": "Data Import / Export",
|
||||
"default_vis": "Default visibility scope",
|
||||
"delete_account": "Delete Account",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue