Merge branch 'feat/customize_friendly_instance_button' into 'dev'

allow to customize the button to friendly instances, set new default value to 'friendly instances' See merge request les/gancio!19
2022-11-25 09:00:05 +00:00
parent a555e06bc5 4139e72638
commit 4c9fda3415
15 changed files with 43 additions and 2 deletions
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -37,6 +37,7 @@ const defaultSettings = {
  trusted_instances: [],
  'theme.is_dark': true,
  'theme.primary': '#FF4500',
+  trusted_instances_label: '',
  hide_thumbs: false,
  hide_calendar: false,
  footerLinks: [