ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,104 Commits
82 Branches
6 Tags
94 MiB
Commit Graph

2104 Commits (85c965eef87bca16cc96316ec9dba16c2337d767)

Author SHA1 Message Date
Moe 85c965eef8 Merge branch 'master' into 'cron-addstorage-fix' 
# Conflicts:
#   cron.js
 2021-11-29 21:58:29 +00:00
Moe 26572e480b fix cron addStorage calculation 2021-11-29 13:56:26 -08:00
Moe b0b12d7261 cron syntax fix for file size setting after old video delete+ 2021-11-28 09:26:02 -08:00
Moe 0c3c183ae8 cron syntax fix for file size setting after old video delete+ 2021-11-28 09:25:36 -08:00
Moe d8c061e8d7 Merge branch 'technokami-master-patch-86130' into 'master' 
update to address mysql_secure_installation to mariadb-secure-installation change

See merge request Shinobi-Systems/Shinobi!346
 2021-11-28 17:17:34 +00:00
Moe 481cb4c75e cron syntax fix for file size setting after old video delete 2021-11-27 19:14:32 -08:00
Moe 71a536c0cd cron syntax fix for file size setting after old video delete 2021-11-27 19:12:54 -08:00
Mike Hurley 4ee1892037 update to address mysql_secure_installation to mariadb-secure-installation change 2021-11-27 04:02:29 +00:00
Mike Hurley 9e3861aec6 update to address mysql_secure_installation to mariadb-secure-installation change 2021-11-27 04:00:50 +00:00
Moe 504c426009 Merge branch 'technokami-dev-patch-99580' into 'master' 
Fix case of repo powertools

See merge request Shinobi-Systems/Shinobi!345
 2021-11-27 03:51:54 +00:00
Mike Hurley 7cd5afd24a Fix case of repo powertools 2021-11-27 03:23:54 +00:00
Moe 4cf642fdf2 Merge branch 'dev' into 'master' 
Last Merge of Dashboard v2 to Master branch

See merge request Shinobi-Systems/Shinobi!343
 2021-11-23 22:55:46 +00:00
Moe f575fdde76 Merge branch 'dev-correct-docker-customAutoLoad-volume' into 'dev' 
Fix VOLUME /customAutoLoad

See merge request Shinobi-Systems/Shinobi!340
 2021-11-23 22:47:17 +00:00
Moe c6f23e85af Merge branch 'matheusdepaula-master-patch-07610' into 'dev' 
Update pt_BR.json

See merge request Shinobi-Systems/Shinobi!341
 2021-11-23 22:46:43 +00:00
Moe 9648f8cc60 update P2P Server list for dev branch 2021-11-18 19:48:13 -08:00
Matheus de Paula bb010997d1 Update pt_BR.json 2021-11-14 02:48:15 +00:00
Elad Bar 318b5940a2 Fix VOLUME /customAutoLoad 2021-11-05 19:34:50 +00:00
Moe 61c99bfc7f Merge branch 'dev-default-database-from-env' into 'dev' 
Fix wrong SQL command on startup (Docker)

See merge request Shinobi-Systems/Shinobi!339
 2021-11-05 13:21:44 +00:00
Elad Bar 3eae0b64c7 Fix wrong SQL exeuction on startup 2021-11-05 10:32:45 +00:00
Moe 1b29dc3f4c Fix Backblaze's response changes 2021-11-04 19:14:42 -07:00
Moe ecf03fa97e Merge branch 'dev' into 'dev' 
Added CI/CD pipeline of auto-build images

See merge request Shinobi-Systems/Shinobi!338
 2021-10-30 16:58:14 +00:00
Elad Bar 5b9b624ebf Update .gitlab-ci.yml 2021-10-30 16:25:39 +00:00
Moe 4180a08060 Merge branch 'dev' into 'dev' 
Updated images to to NodeJS 16 + NVidia CUDA

See merge request Shinobi-Systems/Shinobi!337
 2021-10-30 16:09:40 +00:00
Bar a316f86083 Updated images to to NodeJS 16 + NVidia CUDA 2021-10-30 16:11:36 +03:00
Moe 2c4bbeb5b7 Merge branch 'dev' into 'dev' 
Logic fix for object detection and motion. Allows for motion first to work with yes and no.

See merge request Shinobi-Systems/Shinobi!336
 2021-10-28 19:42:36 +00:00
Ian Rubado 1578300225 Logic fix for object detection and motion. Allows for motion first to work with yes and no. 
Logic fix for object detection and motion. Allows for motion first to work with yes and no.
 2021-10-28 15:37:15 -04:00
Moe 80132ec495 critical update to onvif scanner : fixes import 2021-10-17 22:07:48 -07:00
Moe df74cef008 get snapshot from ONVIF if initialized 
+ minor cleaning
 2021-10-17 22:04:21 -07:00
Moe e89ad75f71 add stimeout to snapshot ffmpeg command 2021-10-16 15:46:13 -07:00
Moe 5a99599bf7 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2021-10-15 13:43:10 -07:00
Moe dc3f94e37c allow swapping pam-diff engine 2021-10-15 13:43:00 -07:00
Moe fe7d9c6e59 Merge branch 'dev' into 'dev' 
Clustering Fixes

See merge request Shinobi-Systems/Shinobi!334
 2021-10-15 15:30:07 +00:00
Jarrod Connolly 0ac6d371e7 delete messages were emitting to wrong childnode 2021-10-15 10:10:29 +08:00
Jarrod Connolly 35e339761f fix master failing to write as dir not existing 2021-10-15 10:05:38 +08:00
Jarrod Connolly 459dc73394 ensure camera stream dir exists on master 2021-10-15 09:58:17 +08:00
Moe cd10e63427 Merge branch 'dev' into 'master' 
Another Day Another Delivery

Closes #339

See merge request Shinobi-Systems/Shinobi!332
 2021-10-08 23:51:19 +00:00
Moe 7071d087d6 force jetson nano tensorflow plugin to create new key every run of installer 2021-10-08 16:47:23 -07:00
Moe 569545fbfd fix for issue #339 2021-10-03 13:04:34 -07:00
Moe 12d04b9bee put autoPtz in after event is validated 2021-09-30 15:49:34 -07:00
Moe b922258a13 fix catching detector events when many posts happen simultaneously 2021-09-27 20:08:18 -07:00
Moe 659fdb93d1 fix onvif scanner import for auto host url 2021-09-18 17:46:56 -07:00
Moe 15954f8b76 remove null matrices from end result 2021-09-15 13:52:34 -07:00
Moe a7c168a73d minor cleanup 2021-09-13 08:03:35 -07:00
Moe f0c00b3def update checking for event handoff to be part of event trigger 
originally it was necessary the initiator of the trigger would provide this flag but it is now checked during the event trigger for all events.
 2021-09-12 12:05:59 -07:00
Moe 3499c42e21 allow multiple ptz tracking target names separated by comma 2021-09-12 10:12:48 -07:00
Moe 06d8976749 minor cleanup 
- fix Retry Connection field visibility
- docker readme update
 2021-09-02 17:51:36 -07:00
Moe b081629103 Merge branch 'rewrite-cameraThread-detectorjs' into 'dev' 
rewrite to cameraThread/detector.js

See merge request Shinobi-Systems/Shinobi!324
 2021-09-02 23:25:55 +00:00
Moe 11dc044ac7 allow dynamic data instead of only trigger data from monitor daemon 2021-08-31 17:03:18 -07:00
Moe dfc747d6ce clean up and better performance 2021-08-28 19:39:11 -07:00
Moe 99a3b1aeed add config.monitorDetectorDaemonPath to change cameraThread/detector.js 2021-08-28 11:21:44 -07:00