Commit Graph

Select branches

Hide Pull Requests

action-chain

add-archived-and-accountType-columns

add-max-days-to-cloud-uploaders

alarm-management

alpha

api-key-management-upgrades

archive-and-sub-as-columns

archive-videos

audio-only-out-and-refactor-monitor-settings

audio-only-output

auto-build-api-doc-with-code

axis-lock

better-liveGrid-monitor-item

better-plugin-controller

build-default-monitor-config-from-definitions

camera-map

change-spawn-to-worker-for-monitor-daemon

configureMonitor-partial-allowed

const-conversion

cron-addstorage-fix

cron-as-worker-process

cycling-live-grid

dashboard-v3

dennis-detector-filters

deprecate-old-monitor-groups

dev

disk-divisor

dropbox-uploader

dynamic-substream

ejs-templating-update

ejs-upgrade-shermdog

email-send-options-from-account

face-manager-integrated

feature-object-tracking

fix-mariadb-no-password-install

fix-multi-trigger

fix-non-showing-inputs

fix-orphan-check-hang

fix-permissions

fix-sub-account-permissions

fix-timelapse-frames-bugs

fix-timelapse-in-addstorage

fix-timezone-by-ui

helping-hand

install-with-shinobicctv-user-instead-of-root

joy-stick-framework

line-crossing

master

matrix-notifications

mitchross-coral-installer-update

montage-api

mount-manager

multiple-central-management-connections

node-20

obj-track-as-separate-option

ox-improvements

p2p-improvements

p2p-v2

patrol-onvif-ptz-gamepad

permission-groups

pipelines

plugin-touch-ups

plugins-allow-selecting-specific-detector

pushover

rally-management

refactor-checkForObjectsInRegions

refactor-monitor-launch

refactor-schedules

refactor-sql-commands-on-startup

report-manager

revert-b25c0d81

rkmpp-v4l2m2m-decode

rtmpServer-verbose

save-notification-video-clips-to-fileBin

socket.io-v4

super-timeline

timelapse-frames-through-websocket

unlink-to-rm

unused-file-cleanup

update-dependencies

upgrade-sftp-uploader

uploaders-refactor

video-slicer-reencoder

wallview-fixes

furrykitten-3

lastv2build

ocean-1

ocean-1.2

ocean-1.2b

ocean-2

Mono Color

• aabfe51e3e Merge branch 'dev' into 'dev' dev Moe 2025-04-21 03:55:44 +0000
• 520c7d251f Merge branch 'dev' into 'dev' Wiktor Pyk 2025-04-21 03:54:47 +0000
• edae7aedff clean up central connector, prevents connecting multiple times at start Moe 2025-04-20 19:33:12 +0600
• 0b3b7cf241 Added pl language (translated by an LLM) Wiktor Pyk 2025-04-20 12:39:19 +0200
• 9ac0e06d50 Merge branch 'master' into 'master' Wiktor Pyk 2025-04-19 20:28:19 +0000
• c4171b2a34 Added pl language (generated by LLM) Wiktor Pyk 2025-04-19 22:20:33 +0200
• 60d35065a7 fix some npm vulnerabilities Moe 2025-04-19 14:34:23 +0600
• 5361caa0b4 fix event filters getting broken in cleanStringsInObject+ Moe 2025-04-18 10:48:48 +0600
• 179781f5b2 fix event filters getting broken in cleanStringsInObject Moe 2025-04-18 10:14:14 +0600
• 95be40ba75 Merge branch 'monitor-details-check-startup' into 'dev' Harry Martland 2025-04-15 18:40:31 +0000
• e355fec306 fix: checks that monitor.details are an object rather than a string at startup Harry Martland 2025-04-15 19:38:59 +0100
• 0f215d7cc0 Merge branch 'ci-cd-pipeline' into 'master' Shivam Chandra 2025-04-15 18:27:16 +0000
• dfda3c3063 ci cd Shivam 2025-04-15 23:56:15 +0530
• 2d97c866c3 Merge branch 'monitor-details-string-at-startup' into 'master' Harry Martland 2025-04-15 18:22:12 +0000
• 493582d1f2 CI CD Pipeline Shivam 2025-04-15 23:44:53 +0530
• dd3410de02 fix: checks that monitor.details are an object rather than a string Harry Martland 2025-04-15 19:06:58 +0100
• 53ffca4a70 add some debugging code to createEventBasedRecording Moe 2025-04-16 00:03:11 +0600
• bab5761ede fix refactored Central Connector when lost connection Moe 2025-04-16 00:01:43 +0600
• f33d19ec22 general fixes on monitor startup Moe 2025-04-15 22:15:25 +0600
• 41702836dd add missing Custom Settings table creation Moe 2025-04-15 22:09:22 +0600
• 1578e0f6e5 make central connector only get IPv4 and ignore internal Moe 2025-04-15 11:39:22 +0600
• ba07a9dfc9 cleanup some logging and spacing Moe 2025-04-15 11:39:05 +0600
• d3b07165ae Add bad cseq log drop to prevent browser log flooding Moe 2025-04-15 11:38:11 +0600
• f78157b8dc Fix failing input_map parse on some monitors, moderinize some details Moe 2025-04-15 11:37:50 +0600
• e42166f4bb Line Cross Counting : Framework Functionality line-crossing Moe 2025-04-15 01:11:37 +0600
• 24f38a42cb Merge branch 'config-refactor-pooling' into 'dev' Harry Martland 2025-04-11 13:17:01 +0000
• 182b438423 Update pairServer.js Moe 2025-04-10 18:28:34 +0600
• 9957f1bb93 Installation Script Shivam Chandra 2025-04-09 15:42:32 +0000
• 2dba13e751 Allow Central Connection without SSH Moe 2025-04-08 22:54:50 +0600
• dc4b329521 refactor central management connector Moe 2025-04-08 15:54:30 +0600
• 2bfae38715 make Max Storage Amount a human inputable/readable value Moe 2025-04-08 13:36:08 +0600
• fd3adba3fc fix broken monitor utils Moe 2025-04-08 13:10:35 +0600
• 6da232bfe1 Allow Commas in cleanStringsInObject function Moe 2025-04-08 10:23:26 +0600
• f8dd2deb14 Add "Alarms" logging/actions and PTZ Updates Moe 2025-04-06 17:24:25 +0600
• 9598115dbd Add Max Days for Cloud Video Uploaders Moe 2025-04-06 17:10:19 +0600
• 97895e2cfd disable client side heartbeat reconnection check p2p-improvements Moe 2025-04-06 17:03:11 +0600
• f010508e48 make fetch ptz command provide response data Moe 2025-04-06 12:19:13 +0600
• 196af5f289 change color of status progress bar Moe 2025-04-06 12:16:37 +0600
• 01470944be Central SSH reconnect with delay Moe 2025-04-06 12:16:11 +0600
• a22247e5c4 Add SSH Proxy Capability to Central Management Moe 2025-04-03 13:30:26 +0600
• d617f585a5 Fix libs/ffmpeg in gitignore Moe 2025-03-24 00:05:03 -0700
• 0377de2668 Add option to periodically reset management connection Moe 2025-03-21 23:21:10 -0700
• 1f1a3ef98f add offline activator Moe 2025-03-21 21:37:04 -0700
• c916d77e4c remove language loaded from account settings Moe 2025-03-21 14:30:30 -0700
• 52e30361ed Add WireGuard VPN scripts (server uses docker) Moe 2025-03-21 14:05:19 -0700
• 5fe84b2f32 key manages camera count Moe 2025-03-21 14:04:51 -0700
• 4de9a1d409 allow "&" in monitor config strings Moe 2025-03-12 16:23:18 -0700
• 8fff018a92 allow "?" in monitor config strings Moe 2025-03-12 13:08:47 -0700
• 8153ee3b6c fix Alarms tab preview video link alarm-management Moe 2025-03-12 11:36:45 -0700
• 324ee75bc2 Add server ip parse for Central Connect Moe 2025-03-12 11:28:32 -0700
• 83a37af0bb Fix Branding by removing User-Level language selection Moe 2025-03-11 13:53:23 -0700
• cb88039a20 reverse Videos list when merging to ensure proper order Moe 2025-03-11 12:47:58 -0700
• ceb13d9ffd Save Frame from FTP Trigger in Timelapse Moe 2025-03-11 12:47:22 -0700
• 9b1f196bd3 Reapply "Fix Cross-site scripting vulnerability in Monitor Edit" (Fixed) Moe 2025-03-08 19:41:45 -0800
• c74f8cadda Revert "Fix Cross-site scripting vulnerability in Monitor Edit" Moe 2025-03-08 19:39:17 -0800
• 007b381997 update getVideoSearchRequestQueries to have operators Moe 2025-03-08 19:22:14 -0800
• 87de4cb475 clean up Videos Table Search Execution Moe 2025-03-08 19:21:20 -0800
• cfc1565861 Fix Cross-site scripting vulnerability in Monitor Edit Moe 2025-03-08 19:21:00 -0800
• ae14d07d5e Update alarmPopup.ejs Moe 2025-03-07 21:34:16 -0800
• 3a226bbff0 make form dark on Alarm Popup Moe 2025-03-07 15:04:04 -0800
• 813c5bd03f clean up Alarm gamepad Moe 2025-03-07 15:03:53 -0800
• 0c677eba5e add height to Alarm popup Moe 2025-03-07 15:03:40 -0800
• feaf5d1040 add download button to Alarm Popup video Moe 2025-03-07 15:03:21 -0800
• 9b05600405 add details from first event to alarm Moe 2025-03-07 14:50:37 -0800
• 03de7575e8 user normal form instead of save on change in alarm popup Moe 2025-03-07 14:50:19 -0800
• 89d846dfcf remove console.log from getEventBasedRecordingUponCompletion Moe 2025-03-07 14:40:59 -0800
• ec624231c0 Make Alarms use normal Videos instead of Notification video + Gamepad PTZ Moe 2025-03-07 14:32:26 -0800
• 3a9582ba3d Add multiple monitors logged to Alarm and updating Alarm+ Moe 2025-03-05 18:26:03 -0800
• b62d1c79fc Add multiple monitors logged to Alarm and updating Alarm Moe 2025-03-05 18:16:08 -0800
• 2677fc421d Fix timezone in alarm popup, add limit query option to Alarms listing Moe 2025-03-05 12:26:33 -0800
• 57dc47c68a Alarms and Event-Based PTZ (Working 80%) Moe 2025-03-04 22:34:30 -0800
• b7813311d0 Alarms (Framework only) and Event-Based PTZ and Utility updates Moe 2025-03-02 20:23:44 -0800
• c699c55c08 remove DB_DISABLE_INCLUDED from Docker image Moe 2025-03-02 13:51:29 -0800
• 5abf92015b Make Monitor Settings post with websocket instead of ajax Moe 2025-02-26 17:50:50 -0800
• e2395d988f clean up websocket callback on complete Moe 2025-02-26 17:48:55 -0800
• 4db2851ac5 ignore ffmpeg folder within Shinobi folder (ffbinaries download) Moe 2025-02-26 17:48:26 -0800
• 99af20d09d Add a cmd tool to mass modify monitor configs with a template Moe 2025-02-26 17:47:42 -0800
• 3cc32da81f refactored config variable names Harry Martland 2025-02-18 20:32:30 +0000
• dfdfd0527f Make PTZ Presets autofill token padding ox-improvements Moe 2025-02-17 22:02:39 -0800
• a3e134a0a0 isolate Region Editor from base.js Moe 2025-02-17 16:20:10 -0800
• 397fda263a make patrol default time to 20 seconds per view Moe 2025-02-17 16:17:05 -0800
• 51d9e52d92 PTZ Presets and Patrol Moe 2025-02-16 19:37:27 -0800
• ccbb02a05a fix reading event base recording for event notify save-notification-video-clips-to-fileBin Moe 2025-02-16 19:34:06 -0800
• 334b0ccf2c update removeSenstiveInfoFromMonitorConfig Moe 2025-02-16 10:17:00 -0800
• 8397b5fcb7 Add Max Days for Cloud Video Uploaders add-max-days-to-cloud-uploaders Moe 2025-02-14 22:37:44 -0800
• a86f40763a Allow Connecting Multiple Central Servers Moe 2025-02-14 20:34:41 -0800
• 6ece34be27 Allow Connecting Multiple Central Servers (fixes) multiple-central-management-connections Moe 2025-02-14 15:26:51 -0800
• 3027b95155 Allow Connecting Multiple Central Servers Moe 2025-02-13 23:46:41 -0800
• 70d4ca76e0 Save Notification Video to FileBin and send info to MQTT Moe 2025-02-13 12:28:53 -0800
• 481e6e1d8d API Key Management Upgrades Moe 2025-02-12 21:09:55 -0800
• 6fabbee05b add API Endpoint for getting a single row api-key-management-upgrades Moe 2025-02-12 21:07:39 -0800
• 936f14cad9 Update Central API Key Creation Moe 2025-02-10 16:04:16 -0800
• 1883f8f2e9 Fix Central API Key acquisition Moe 2025-02-10 13:50:22 -0800
• 3a2d13894d Upgrade API Key Management : Edit User Settings and Permission Sets Moe 2025-02-10 13:41:10 -0800
• bae9254079 Upgrade API Key Management : Permission to allow managing API Moe 2025-02-09 22:35:53 -0800
• 95d66f99e0 Upgrade API Key Management : Permissions and Editing Moe 2025-02-09 20:41:07 -0800
• d7a830104e Add Custom Settings API Moe 2025-02-07 15:58:48 -0800
• 9edad4bed1 clean up getMonitors API and add websocket method Moe 2025-02-07 14:50:12 -0800
• b5386e89d4 Permission Groups + Websocket API for Editing Monitor Moe 2025-02-05 19:42:27 -0800
• 37ebdba546 Merge branch 'dev' into 'master' master Moe 2025-02-06 03:41:12 +0000