Merge branch 'main' into v2

* main:
  build: use specific token for pushing release tags
  fix(gui): update `uncamel()` to handle strings like 'IDs' (fixes #10128) (#10131)
  refactor: use slices package for sort (#10132)
  build: process for automatic release tags (#10133)
  chore(gui, man, authors): update docs, translations, and contributors
This commit is contained in:
Jakob Borg
2025-05-26 14:22:30 +02:00
51 changed files with 375 additions and 115 deletions
+3 -2
View File
@@ -17,6 +17,7 @@ import (
"net/url"
"os"
"reflect"
"slices"
"sort"
"strconv"
"strings"
@@ -380,8 +381,8 @@ func (cfg *Configuration) prepareFolders(myID protocol.DeviceID, existingDevices
}
}
// Ensure that the folder list is sorted by ID
sort.Slice(cfg.Folders, func(a, b int) bool {
return cfg.Folders[a].ID < cfg.Folders[b].ID
slices.SortFunc(cfg.Folders, func(a, b FolderConfiguration) int {
return strings.Compare(a.ID, b.ID)
})
return sharedFolders, nil
}