ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,379 Commits
75 Branches
6 Tags
92 MiB
Commit Graph

3379 Commits (node-20)

Author SHA1 Message Date
Moe 1ca8edd78b auto close snapshot worker after 10 seconds if left hanging 2023-04-11 13:02:43 -07:00
Mohammad Ghayeni 97c0b95bf4 move monitor groups button to top 2023-04-11 13:54:33 +03:30
Mohammad Ghayeni aa11814ea8 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into contribution 2023-04-10 15:37:58 +03:30
Moe 63c00588bd Merge branch 'docker-nonroot' into 'dev' 
Allow docker image to run as non-root

See merge request Shinobi-Systems/Shinobi!462
 2023-04-10 01:37:58 +00:00
Felix Eckhofer 0f4b4321af
Allow docker image to run as non-root 2023-04-08 16:47:49 +02:00
Moe c837cdc109 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-04-06 12:10:46 -07:00
Moe f6c34befa2 add protocol prefix to s3-based endpoint 2023-04-06 12:10:38 -07:00
Moe 68d1683fd8 Merge branch 'default-super-config-values' into 'dev' 
Fix super config default values

See merge request Shinobi-Systems/Shinobi!459
 2023-04-06 17:11:25 +00:00
Elad Bar 12151602ef Fix super config default values 2023-04-06 17:11:25 +00:00
Moe a9ad989873 Merge branch 'droptimelapseframes' into 'dev' 
Droptimelapseframes

See merge request Shinobi-Systems/Shinobi!456
 2023-03-30 03:30:31 +00:00
Moe a79976142b fix reverted packages in package.json 2023-03-29 10:55:58 -07:00
Moe 1a70e8888c add README viewer to plugin manager 2023-03-29 09:36:49 -07:00
Moe 02cc30be4e Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-03-28 08:43:30 -07:00
Moe 4ce0eb1415 make Poseidon the default Stream Type 2023-03-28 08:43:12 -07:00
Moe e22713033d update convertJsonToAccordionHtml 2023-03-28 08:42:58 -07:00
Moe 47c462bca4 Merge branch 'fix-typo-splitforffmpeg' into 'dev' 
Fix typo splitforffmpeg

See merge request Shinobi-Systems/Shinobi!461
 2023-03-28 15:26:24 +00:00
Unicate 545a6f64ff fix typo for function splitForFFMPEG 2023-03-28 09:11:21 +07:00
Moe a15fe04ace update mp4frag 2023-03-26 23:31:21 -07:00
Moe b2b6d4b3f8 Merge branch 'dev' into 'dev' 
Proposal to resolve error where postData was being sent on a GET request.

See merge request Shinobi-Systems/Shinobi!449
 2023-03-19 17:22:23 +00:00
Moe a0d280e9fe Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-03-17 08:41:59 -07:00
Moe 2e65403317 make size (Cloud Videos and Files) columns longer 2023-03-17 08:41:48 -07:00
Moe 21cd956925 Merge branch 'dev' into 'dev' 
Adjust all integer column types to bigint

See merge request Shinobi-Systems/Shinobi!458
 2023-03-17 15:39:14 +00:00
Mike Hurley 7be60707c8 Adjust all integer column types to bigint 2023-03-17 15:39:14 +00:00
Moe 2a45650628 make path (Monitors) and size (Videos) columns longer 2023-03-17 08:37:48 -07:00
Moe 301f3a690e !457 fix 2023-03-15 21:00:41 -07:00
Ian Rubado ac5305c2b5 Fixed boolean logic 2023-03-15 22:18:06 -04:00
Ian Rubado af914b4150 New config option to drop timelapse frames 2023-03-15 19:50:57 -04:00
Moe 4aa2dad7c8 Merge branch 'dev' into 'master' 
Fix Multi Record Monitor Tags on Event

See merge request Shinobi-Systems/Shinobi!454
 2023-03-15 22:27:48 +00:00
Moe e2915842ae Add Test Module terms+ 2023-03-15 13:56:51 -07:00
Moe 5e60c26eeb Fix Multi Record Monitor Tags on Event 
commit 57168bd7e9
Author: Moe <github@m03.ca>
Date:   Wed Mar 15 13:25:00 2023 -0700

    clean up UI, rename field to "Trigger Monitors with Tags"

commit 592a1f6144
Author: Moe <github@m03.ca>
Date:   Wed Mar 15 13:24:26 2023 -0700

    fix bindTagLegendForMonitors

commit ac68b16bf6
Author: Moe <github@m03.ca>
Date:   Wed Mar 15 11:47:32 2023 -0700

    Fix Triggering Record by Monitor Tags
 2023-03-15 13:25:43 -07:00
Moe 839ec26477 Merge branch 'dev' into 'master' 
Paladium+ : Critical Fixes

See merge request Shinobi-Systems/Shinobi!453
 2023-03-15 04:37:45 +00:00
Moe 9bb2f82a7a Merge branch 'master' into 'dev' 
# Conflicts:
#   libs/commander/workerv2.js
 2023-03-15 04:36:55 +00:00
Moe e2f53d2cd2 cleanup p2p init and fix breakge with blank ssl object 2023-03-14 21:33:17 -07:00
Moe 9c010901fd refactor ssl server init, add config.autoRedirect 
- add config.autoRedirect for https redirect
 2023-03-14 21:32:44 -07:00
Moe 6c2669fd98 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-03-14 21:17:44 -07:00
Moe e6d8a66a86 Add Test Module terms 2023-03-14 21:17:40 -07:00
Moe d9c1b018a7 Fix Copy Link and Launch for P2P Easy Remote Access 2023-03-14 21:17:06 -07:00
Moe 1c7cc2e95b Merge branch 'dev' into 'master' 
Paladium : Critical Fixes

See merge request Shinobi-Systems/Shinobi!452
 2023-03-13 01:31:11 +00:00
Moe 2c243b6740 Paladium : Critical Fixes 2023-03-13 01:31:11 +00:00
Moe 31a4745c77 Merge branch 'feature-object-tracking' into 'dev' 
Ignore Non-Moving Objects

See merge request Shinobi-Systems/Shinobi!450
 2023-03-11 22:33:12 +00:00
Moe aa19cc13a4 Ignore Non-Moving Objects 2023-03-11 22:33:12 +00:00
Moe dc936e441a Fix displaying objects on live stream when resized 2023-03-09 21:17:52 -08:00
Moe 734ba63b3b fix missing mysql package on Docker images 2023-03-09 11:11:55 -08:00
Moe dc0fbf5b50 prevent MJPEG web path error on startup while connecting 2023-03-06 19:43:50 -08:00
Moe f54e72831d Update Docker README 2023-03-06 09:33:44 -08:00
Moe 7ea60b686c Merge branch 'docker-nodb' into 'dev' 
Created a no database-included Dockerfile that works with MariaDB and Postgres

See merge request Shinobi-Systems/Shinobi!443
 2023-03-06 17:29:24 +00:00
Gavin 582b38e321 Created a no database-included Dockerfile that works with MariaDB and Postgres 2023-03-06 17:29:24 +00:00
Moe 8e506869d5 Update installAllCustomAutoLoadPackages.js 2023-02-28 10:39:35 -08:00
Moe e9fe007527 tool to install all package.json in customAutoLoad 2023-02-28 09:50:20 -08:00
Moe f366f7b0bb safe parsing for input_map_choices in ui 2023-02-24 11:27:11 -08:00