Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev

2026-04-25 03:29:58 -07:00 · 2024-02-12 15:52:34 +00:00
parent c99bb46238 c8e62ba5e8
commit 4027db5156
119 changed files with 17570 additions and 36 deletions
--- a/applications/main/archive/helpers/archive_browser.h
+++ b/applications/main/archive/helpers/archive_browser.h
@@ -34,6 +34,7 @@ static const char* known_ext[] = {
    [ArchiveFileTypeBadKb] = ".txt",
    [ArchiveFileTypeU2f] = "?",
    [ArchiveFileTypeApplication] = ".fap",
+    [ArchiveFileTypeJS] = ".js",
    [ArchiveFileTypeSearch] = "*",
    [ArchiveFileTypeUpdateManifest] = ".fuf",
    [ArchiveFileTypeFolder] = "?",
--- a/applications/main/archive/helpers/archive_files.h
+++ b/applications/main/archive/helpers/archive_files.h
@@ -21,6 +21,7 @@ typedef enum {
    ArchiveFileTypeBadKb,
    ArchiveFileTypeU2f,
    ArchiveFileTypeApplication,
+    ArchiveFileTypeJS,
    ArchiveFileTypeSearch,
    ArchiveFileTypeUpdateManifest,
    ArchiveFileTypeFolder,