Commit Graph

4297 Commits

Author SHA1 Message Date
MX ed57ddb14b NFC: Plaintain parser fix
by mxcdoam
https://github.com/flipperdevices/flipperzero-firmware/pull/3975/files
2024-10-29 02:28:33 +03:00
MX e87356af72 Merge remote-tracking branch 'OFW/portasynthinca3/3922-gpio-crash' into dev [ci skip] 2024-10-28 23:20:13 +03:00
MX e7b64c843c upd manifest 2024-10-28 22:50:07 +03:00
MX 3d52187aa9 ndef parser updates
by luu176 and Willy-JL
2024-10-28 22:45:02 +03:00
MX e630f44afd merge p2 2024-10-28 22:22:21 +03:00
MX 6b6d98da2a merge js changes
changes by Willy-JL
spi module by jamisonderek
2024-10-28 22:21:42 +03:00
MX e7239f6e8b Merge remote-tracking branch 'noproto/nestednonces' into dev 2024-10-26 01:37:44 +03:00
noproto 6dbb46a81d Fix issue with resume logic 2024-10-25 18:38:11 -04:00
Anna Antonenko 91fcddc205 Merge branch 'dev' into portasynthinca3/3922-gpio-crash 2024-10-24 12:56:54 +03:00
Anna Antonenko d0214c7b27 fix: incorrect usage of mjs_own 2024-10-23 20:07:03 +03:00
Nathan N 47637621a7 Merge branch 'dev' into nestednonces 2024-10-22 09:52:25 -04:00
MX b0e591601c upd ndef parser
by jaylikesbunda and Willy-JL
2024-10-22 02:37:04 +03:00
MX fc16978be5 Merge remote-tracking branch 'OFW/dev' into dev [ci skip] 2024-10-22 02:28:24 +03:00
Zinong Li f8fa71c575 NFC TRT Parser: Additional checks to prevent false positives (#3966)
* additional checks to prevent false positives
* Update trt.c

Co-authored-by: あく <alleteam@gmail.com>
2024-10-20 16:58:33 +01:00
MX 48acd9f075 merge examples 2024-10-20 16:01:21 +03:00
MX 8c960a990c merge js upds
by jamisonderek & Willy-JL
2024-10-20 16:00:10 +03:00
MX 2441643ac6 subghz monarch add manually 2024-10-19 15:40:35 +03:00
MX 8cdb5619f5 keeloq add key 2024-10-19 15:19:57 +03:00
MX 0b7f174162 fix icon 2024-10-19 12:33:57 +03:00
MX fe3228b63e merge p2 2024-10-18 20:22:21 +03:00
MX bc73b13b1b merge js stuff
https://github.com/Next-Flip/Momentum-Firmware/commits/js-backport-of-backport/
2024-10-18 20:21:09 +03:00
MX 37f76374a2 Merge remote-tracking branch 'OFW/dev' into dev 2024-10-18 14:30:37 +03:00
Nathan N 2be0cfb04b Merge branch 'dev' into nestednonces 2024-10-17 19:16:17 -04:00
porta b723d463af Revert "[FL-3909] CLI improvements, part I (#3928)" (#3955)
This reverts commit 0f831412fa.

Co-authored-by: あく <alleteam@gmail.com>
2024-10-17 17:12:27 +01:00
Ivan Barsukov ca68c953c0 Add warning about stealth mode in vibro CLI (#3957) 2024-10-17 16:57:10 +01:00
MX e2d0a86d3e merge js stuff
by Willy-JL
2024-10-17 17:06:51 +03:00
あく 2bc02c0962 Merge branch 'dev' into nestednonces 2024-10-16 18:07:13 +01:00
MX 5434405c34 Merge remote-tracking branch 'OFW/dev' into dev 2024-10-16 19:46:06 +03:00
MX 4e5abdadff fix cli breaking web flipper lab, remove color tags 2024-10-16 19:35:52 +03:00
Zinong Li 1dd7ebd059 NFC Parser for Tianjin Railway Transit (#3954) 2024-10-16 16:38:07 +01:00
MX 8d2476733e Merge remote-tracking branch 'OFW/dev' into dev 2024-10-16 18:21:22 +03:00
porta c2c288b9ad [FL-3916] Require PIN on boot (#3952)
Co-authored-by: hedger <hedger@users.noreply.github.com>
2024-10-16 16:12:58 +01:00
MX 521b793011 merge js 2 2024-10-16 18:09:02 +03:00
MX 38fb892cbb merge js upds 1 2024-10-16 18:07:58 +03:00
MX cd46d8ca07 more js stuff
https://github.com/Next-Flip/Momentum-Firmware/commits/js-backport-of-backport/
2024-10-16 15:09:51 +03:00
MX f37799e0f4 merge examples fixes [ci skip]
by Willy-JL
p2
2024-10-16 14:50:05 +03:00
MX 63d1890156 merge missing js backports of backports by Willy-JL
p1
2024-10-16 12:03:31 +03:00
MX 7415873449 add new nfc key [ci skip] 2024-10-16 01:30:19 +03:00
MX a1993a528d badusb js paritally fix 2024-10-16 01:11:34 +03:00
MX ac3c6dc4f9 move examples 2024-10-16 01:07:03 +03:00
MX 7de26fb99b Merge remote-tracking branch 'OFW/dev' into dev 2024-10-16 01:06:19 +03:00
MX 004d8382d3 implement byte input, add missing args in text input
TODO: add missing filebrowser dialog
2024-10-16 00:57:44 +03:00
Kowalski Dragon c917135c94 [BadUSB] Improve ChromeOS and GNOME demo scripts (#3948)
* [BadUSB] Gnome Demo: Support most terminals and force sh shell when not using Bash as default
* [BadUSB] ChromeOS Demo: Minor improvements, such as exit overview, select omnibox and add a page title

Signed-off-by: Kowalski Dragon (kowalski7cc) <5065094+kowalski7cc@users.noreply.github.com>
Co-authored-by: Kowalski Dragon (kowalski7cc) <5065094+kowalski7cc@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>
2024-10-15 18:23:49 +01:00
Zinong Li dc9548d0dc New Static Keys for Mifare Classic Dictionary (#3947)
Co-authored-by: あく <alleteam@gmail.com>
2024-10-15 18:17:33 +01:00
Astra a34e09094b [FL-3914] BackUSB (#3951)
* Revert "[FL-3896] Split BadUSB into BadUSB and BadBLE (#3931)"
  This reverts commit 0eaad8bf64.
* Better USB-BLE switch UX
* Format sources
* Format images

Co-authored-by: あく <alleteam@gmail.com>
2024-10-15 18:11:41 +01:00
porta a6cf08523c Small JS fixes (#3950) 2024-10-15 18:03:15 +01:00
MX 8233534d6a merge p3 2024-10-15 03:27:04 +03:00
MX edc58c5a0e merge p2 2024-10-15 03:16:21 +03:00
MX 45bc0e1ce6 after merge fix p1 2024-10-15 00:43:52 +03:00
MX 4b9b1769f7 Merge remote-tracking branch 'OFW/dev' into dev 2024-10-15 00:08:47 +03:00