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

2250 Commits (36fe174877025e3d50be50919edeebebf23a7722)

Author SHA1 Message Date
Moe 36fe174877 fix Additional Input Map not loading fields+ 2021-12-04 08:42:49 -08:00
Moe 6e48a1d928 fix definition field names, fix Additional Input Map not loading fields 2021-12-04 08:42:34 -08:00
Moe 7b6c939de0 fix event based recording... oof 2021-12-03 17:52:40 -08:00
Moe 80f5225191 remove frame limit on timelapse frame retrieval 2021-12-03 10:20:56 -08:00
Moe 4b418ed8a3 fix managing addStorage 2021-11-30 08:24:36 -08:00
Moe 956728b373 re-add baseURL ruling to dashboard-v3 2021-11-29 21:00:16 -08:00
Moe 6469a7e063 fix Sub Account Manager delete 2021-11-29 18:52:37 -08:00
Moe 280c8f79a3 Merge branch 'dashboard-v3' of https://gitlab.com/Shinobi-Systems/Shinobi into dashboard-v3 2021-11-29 17:47:14 -08:00
Moe 2084b0b8c8 fix Sub Account Manager Edit new account before page refresh and delete 2021-11-29 17:46:55 -08:00
Moe 4ad0eb430e Merge branch 'cron-addstorage-fix' into 'dashboard-v3' 
Fix cron addStorage calculation on delete old video

See merge request Shinobi-Systems/Shinobi!349
 2021-11-30 00:11:44 +00:00
Moe 8bcf65f64d Merge branch 'dev' into 'dashboard-v3' 
# Conflicts:
#   cron.js
 2021-11-30 00:06:51 +00:00
Moe ab38da7ed8 Merge branch 'dashboard-v3' into 'cron-addstorage-fix' 
# Conflicts:
#   cron.js
 2021-11-30 00:02:10 +00:00
Moe aa6bad7891 Merge branch 'cron-addstorage-fix' into 'dev' 
Fix cron addStorage calculation on delete old video

See merge request Shinobi-Systems/Shinobi!348
 2021-11-29 22:07:31 +00:00
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 63c268aec3 cron syntax fix for file size setting after old video delete+ 2021-11-28 09:25:01 -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 f15905f859 cron syntax fix for file size setting after old video delete 2021-11-27 19:15:10 -08: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 c4f78ede6a fix posting on ONVIF Device Manager Endpoints 2021-11-23 22:56:50 -08:00
Moe 0cc3344489 Port over ONVIF Device Manager 2021-11-23 21:05:56 -08:00
Moe 367d768846 Create cuda-11.sh 2021-11-23 15:33:24 -08:00
Moe ec5b12d57d fix videos rows showing event frames from other monitors 2021-11-23 15:32:57 -08:00
Moe 2cab5c3063 re-arrange power video 2021-11-23 15:32:35 -08: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 9a0b766631 P2P Connection check every 15 minutes if disconnected 2021-11-21 07:39:40 -08:00
Moe f7dd4bae91 P2P Fix for Dashboard V3 2021-11-20 13:08:59 -08:00
Moe 9648f8cc60 update P2P Server list for dev branch 2021-11-18 19:48:13 -08:00
Moe 1bc684e627 event filter and mqtt fixes 2021-11-16 18:02:27 -08:00
Moe aa65df241f fix displaying Uploader fields 2021-11-15 13:09:37 -08:00
Moe 256658f9da MQTT Outbound Messages++ 2021-11-15 11:41:08 -08:00
Moe 7ffe3bc7f0 get latest p2p server list on start 2021-11-15 10:39:01 -08:00
Moe b2eab1573b Merge branch 'dev' into 'dashboard-v3' 
Critical Changes from Dev into Dash v3

See merge request Shinobi-Systems/Shinobi!342
 2021-11-15 18:20:07 +00:00
Moe 8cfc0f5f7c MQTT Outbound Messages+ 2021-11-15 10:19:31 -08:00
Moe fda5f1cb82 MQTT Intake -> MQTT Inbound, Add "All Monitors" trigger 2021-11-15 00:10:43 -08:00
Moe cfbb528770 Integrate MQTT Outbound Messages 0.1 2021-11-15 00:08:37 -08:00
Moe 1cc56ca0e8 Integrate MQTT Event Intake 0.1++ 2021-11-14 08:38:22 -08:00
Matheus de Paula bb010997d1 Update pt_BR.json 2021-11-14 02:48:15 +00:00
Moe c7e84111e3 Integrate MQTT Event Intake 0.1+ 2021-11-13 14:51:40 -08:00
Moe fbbe8fb0c7 Integrate MQTT Event Intake 0.1 2021-11-12 18:32:53 -08:00
Moe 1d8ab96c9a minor cleanup 2021-11-11 22:08:39 -08:00