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

384 Commits (master)

Author SHA1 Message Date
Moe Alam 628df16ae0 Revert "update monitor muting for modern browsers" 
This reverts commit 55cec40869.
 2020-12-01 07:26:58 -08:00
Moe Alam 7442b999d7 fix alarm if statement 2020-12-01 07:25:45 -08:00
Moe Alam 55cec40869 update monitor muting for modern browsers 
must interfact with web page before audio can automatically be unmuted
 2020-12-01 07:25:25 -08:00
Moe Alam 74e75c3231 basic onvif device manager functions 2020-11-28 18:52:02 -08:00
Moe Alam 8dacf45b48 show proper fields on monitor edit 2020-11-25 19:46:25 -08:00
Moe Alam f6bb25d091 clean up ffmpeg.js and use of ffprobe 2020-11-16 18:08:24 -08:00
Moe Alam a03fa3ff7a add Cloud Videos toggle to Power Viewer 2020-11-12 16:32:28 -08:00
Moe Alam ccd2261b18 cleanup Google Drive Upload code 2020-11-08 21:20:39 -08:00
Moe Alam 555ef51442 ONVIF Scanner single selection enable ONVIF connection on save by default 
+ Enable PTZ on cameras that report PanTilt and Zoom Configurations
 2020-11-05 21:34:49 -08:00
Moe Alam c45bb8b588 revert script execution order 2020-11-04 08:52:47 -08:00
Moe Alam 1c03744f5a Add "Add All" button to ONVIF Scanner (Adds all cameras not already added) 2020-11-03 21:58:00 -08:00
Moe Alam fd4d228046 re-add Update button to Superuser panel (dedicated and git-only) 2020-10-29 20:56:57 -07:00
Moe Alam 915be87187 Update ONVIF Scanner result layout 2020-10-29 18:35:21 -07:00
Moe Alam c21ec0d1b9 ONVIF Scanner show Snapshot 2020-10-29 16:14:52 -07:00
Moe Alam 588b183dae framework for Monitor Configuration Warnings and Automatic Repair 2020-10-25 22:07:36 -07:00
Moe Alam c69d761009 ShinobiHub config search use public configs 2020-10-18 18:54:08 -07:00
Moe Alam 24141f0e48 add proper message for timelapse frame deletion 2020-10-10 10:36:13 -07:00
Moe Alam 560cf2c7ec add row caching and add delete button for timelapse frames 2020-10-09 22:49:11 -07:00
Moe Alam aae352c998 humanize timelapse mp4 builder 2020-10-09 12:34:15 -07:00
Moe Alam 862bcb4d1d Show more live stats in P2P Server selection 2020-10-08 17:01:23 -07:00
Moe Alam acb7035769 Display Currently Registered P2P Server 2020-10-03 14:20:53 -07:00
Moe Alam 53b9c42c2c add feedback for copying to clipboard 2020-10-03 12:02:28 -07:00
Moe Alam 6dc438fdd7 humanize P2P UI more 2020-10-03 11:54:48 -07:00
Moe Alam 04d57a56c1 show network use in p2p server stats 2020-10-03 00:27:04 -07:00
Moe Alam eb8d893b72 Show stats of P2P Server in list 2020-10-02 23:13:06 -07:00
Moe Alam e45c411490 Add Production P2P Servers to list in Super User Panel 2020-10-02 21:27:29 -07:00
Moe Alam 5cafdf57b3 fix autoplay Poseidon and HLS if browser is not selected while loading 2020-10-01 09:30:26 -07:00
Moe Alam c35f286fad cleaner connection to p2p 2020-09-27 22:14:36 -07:00
Moe Alam 6e2ab4d61f Add UI for Easy Remote Access (P2P) in Superuser panel 2020-09-26 22:52:52 -07:00
Moe b04749852b Merge branch 'dev' into 'p2p-framework' 
# Conflicts:
#   libs/monitor.js
 2020-09-22 15:45:34 +00:00
Moe Alam fe928efcab minor cleanup to usage 2020-09-21 23:49:18 -07:00
Moe Alam edbcbcdd29 update PTZ button appearance 2020-09-20 21:26:01 -07:00
Moe Alam 91fadc44df P2P : Can create connection based on config 2020-09-13 23:49:52 -07:00
Levent Koch 72105d4656 hide detection info on fullscreen video in power viewer 2020-09-03 20:48:03 +02:00
Moe a3df638988 Update CPU and RAM collection and display methods 2020-08-27 15:40:30 -07:00
Sebastián Felipe 7e44316c39 issue solved 2020-08-26 14:41:20 -04:00
Austin Lakeman 31eaa2efbc timelapse and minor error fixes 2020-08-25 21:55:01 +00:00
Moe 6c577f7691 add cuda and opencl hwaccel options+ 2020-08-19 14:34:41 -07:00
Moe 1a7ce7e462 fix delete function in UI 2020-08-17 21:16:03 -07:00
Moe 8481ef2eb6 simulate bootstrap 4 columns 2020-08-14 19:22:13 -07:00
Moe 1b6d07560c Fix display "Disabled" status in UI 2020-08-14 14:25:46 -07:00
Moe 64604520ea fix "Viewed" color on play button in Videos List 2020-08-11 21:59:56 -07:00
Moe 73881a3337 Update dash2.config.js 2020-08-11 19:52:18 -07:00
Moe 70eedf740e customAutoLoad UI : minor prettify++ 2020-08-10 21:40:22 -07:00
Moe 299f3c1923 customAutoLoad UI : minor prettify+ 2020-08-10 21:31:27 -07:00
Moe a200b41fc6 customAutoLoad UI : minor prettify 2020-08-10 21:18:33 -07:00
Moe 8bf7909191 customAutoLoad UI : Display Install Information 2020-08-10 21:10:05 -07:00
Moe 36d7c71a54 customAutoLoad management fixes 2020-08-10 15:58:56 -07:00
Moe e119bd10d6 customAutoLoad Module UI : Download Method 2020-08-09 23:22:35 -07:00
Moe 7f997649df customAutoLoad Module UI : Enable, Disable, Delete, Install functions 2020-08-09 23:13:18 -07:00
Moe a09472ba06 always show Live GPS data on top when visisble 2020-07-30 13:27:28 -07:00
Moe 1a517057ce Circular Live GPS Map 2020-07-29 19:00:08 -07:00
Moe d31f602e29 Add Speed and Heading to Live GPS Display 2020-07-29 18:41:38 -07:00
Moe 22f2d37f1f Show GPS data on Video Recordings (if they have it) 2020-07-29 16:38:04 -07:00
Moe f523ccc2f2 Add Live GPS Display from Dashcam App (NinjaCam) 2020-07-29 11:00:30 -07:00
Moe ba5743e380 set "Test Trigger" button to result in 100% change not 197% 2020-07-24 10:31:04 -07:00
Moe 05f6b02308 minor clean up 2020-07-22 21:22:37 -07:00
dennis.cartier 5ddfbcb5d3 Add support for testing count of matched objects 2020-06-26 05:43:36 -04:00
Moe 57a876e28d minor cleanup for PTZ handling 2020-06-13 11:46:20 -07:00
Moe c96742c379 Refactor ONVIF Scanner (front-end) 2020-06-06 22:03:51 -07:00
Moe 600a7f5641 Better ONVIF Scanner, now displays all found network devices 
- Will now display ONVIF devices if auth fails
- will now display all network devices with operating web panels
 2020-06-06 20:45:08 -07:00
Moe 6a41e27908 remove stop button from Probe window 2020-06-06 15:43:21 -07:00
Moe 34d9b49f6b Refactor Probe tool (backend), cleanup Probe tool (front) 2020-06-06 15:29:57 -07:00
Moe 5bf8a04d53 Probe result can populate Monitor Settings window 2020-06-06 13:47:27 -07:00
Moe cebceae8b2 lay in framework for Probe result to populate Monitor Settings window 2020-06-06 13:13:57 -07:00
Moe 1ef663f1c6 Add colored dots to follow-lists 
- shows original color of section if theme has been applied
 2020-06-05 15:14:35 -07:00
Moe 55b988e707 Fix mismatch ID on Detector FIlters 2020-06-03 11:28:14 -07:00
Moe bf1727762d fix renaming detector filter 2020-06-02 23:13:58 -07:00
Moe 45ff957103 rewrite operation method of detector filters window (front-end) 2020-05-30 19:15:12 -07:00
Moe 1dfb350aa3 Add Deep Forest and Night Garden themes, reskin login screen to Deep Forest 2020-05-30 09:02:59 -07:00
Moe 567d2035ae Update super.configEditor.js 2020-05-28 20:31:07 -07:00
Moe 54576b57a5 Fix buttons visibility in super panel when window is too small 2020-05-28 20:29:53 -07:00
Moe 3bec7a95d7 Minor Adjustments to UI, swap Mode changing button with Event Trigger button 2020-05-28 11:34:53 -07:00
Moe c2a9633cc1 Refactor Schedules js, add Scheduler launcher in Preset section 2020-05-27 17:46:37 -07:00
Moe 994fcd5766 Refactor Detector Filters window 2020-05-27 17:28:42 -07:00
Moe 4e45668ef3 fix saving over last detector filter when closing and reopening filter window 2020-05-26 23:16:55 -07:00
Moe d8c4cec581 Update Ice Theme 2020-05-26 21:19:06 -07:00
Moe 77edbc015c add Ice Theme 2020-05-26 21:12:44 -07:00
Moe 6b2c73212c show how many monitors associated to preset 2020-05-26 20:33:55 -07:00
Moe b2db778b7c add quick load for monitor preset 2020-05-26 20:26:31 -07:00
Moe 0d5c911ad9 show more information in getHumanizedMonitorConfig() 2020-05-26 19:52:59 -07:00
Moe 5f85b2b3a6 ui css adjustment 2020-05-26 19:48:56 -07:00
Moe 85213d3afe fix launching region editor 2020-05-26 19:47:17 -07:00
Moe d73a72e19f remember which sections were hidden 2020-05-26 19:27:50 -07:00
Moe f9aefe7c1b UI adjustments and fixes 2020-05-26 19:16:50 -07:00
Moe 50cebcae8a allow hiding monitor section by clicking header 2020-05-26 17:43:28 -07:00
Moe 940ddb4fab add a little validation for monitor preset addition 2020-05-26 17:20:23 -07:00
Moe bfd453b706 display presets in delete confirm window 2020-05-26 17:00:01 -07:00
Moe 287d670506 add delete button and clean up some re-used functions 2020-05-26 16:47:06 -07:00
Moe 893f8f37e8 display changes in Preset with humanized name tags 2020-05-26 16:30:24 -07:00
Moe 402247bf91 fix posting values that were not changed 2020-05-26 15:14:59 -07:00
Moe e2ea8c03fe Allow creating Presets from inside Monitor Settings window 2020-05-25 20:49:12 -07:00
Moe 08468ef5cd refactor monitoredit.js, prepare to merge montiorStates (preset creation) 2020-05-25 14:31:22 -07:00
Moe 9a33f0c83b add break word option to confirm window create function 2020-05-25 14:30:13 -07:00
Moe b00c41a1d6 minor css fix for delete monitor window 2020-05-25 14:29:20 -07:00
Moe 8f97912e6b Refactor Probe Tool, fix querying urls with & 2020-05-25 14:27:54 -07:00
Moe 295766b2a8 Basic Event Counts Windows, display chart by tag name 2020-05-24 19:41:24 -07:00
Moe 90ff600c26 Add searching ShinobiHub Explore (Uploaded and All) 2020-05-20 22:47:29 -07:00
Moe db7893643e make hub import use deep merge on default settings in case 2020-05-20 15:07:14 -07:00
Moe 58df790e97 mergeDeep added 
mergeDeep is the same as Object.assign except it works upon multiple layers of an object
 2020-05-20 15:06:39 -07:00
Moe 2ad0cae75f expand details column in default monitor object 2020-05-20 15:05:52 -07:00
Moe 4cb4276682 Basic ShinobiHub view window for user uploaded configurations 2020-05-20 14:03:45 -07:00
Moe 59becdfbff update JSON.parse to $.parseJSON in dash2.monitoredit.js 2020-05-20 14:02:55 -07:00
Moe 410a6de983 light touch up on timelapse performance and UI 2020-05-16 19:27:23 -07:00
Moe f110ca349e better timelapse playback, fix layout 2020-05-16 18:20:59 -07:00
Moe 06b81cea22 refactor Timelapse code, fix date selection 2020-05-16 13:01:09 -07:00
Moe d43270a9c8 light formatting 2020-05-07 08:42:41 -07:00
Moe 88f6ab2b63 change date format shown in date picker (day first) 2020-05-07 08:39:37 -07:00
Moe 3179fe1a20 fix UTC bug in calendar 2020-05-07 08:39:19 -07:00
Moe 7248e3cefe Fix broken stream because of "muted" property 2020-05-06 17:30:33 -07:00
Moe 8cc80a65c9 Make debugLog visible in configuration if not set 2020-05-04 08:38:13 -07:00
Moe f33cb3e97b sorting more friendly for monitor icons in side menu 2020-05-02 22:32:32 -07:00
Moe 38a6915b4a minor UI adjustments to sidmenu 2020-05-02 18:53:15 -07:00
Moe 1502d0a200 Allow disabling Wallclock Timestamps with conf.json parameter 
- add `"wallClockTimestampAsDefault":false` to disable it.
 2020-04-19 07:56:56 -07:00
Moe b3cfcc1b4a Update super.configEditor.css 2020-04-18 23:22:01 -07:00
Moe d32f07def5 Update super.configEditor.js 2020-04-18 23:19:47 -07:00
Moe fa96bd7043 Finalize Configuration Editor, refactor some super panel js/ejs 2020-04-18 23:11:55 -07:00
Moe 605f227897 Base framework for JSON Editor on Configuration in Super panel 2020-04-18 22:00:50 -07:00
Moe 7a81679803 Add "useOldPowerVideo" option to config, Add Events chart to each monitor 
- setting this parameter to "true" will result swapping the new power video viewer with the old one.
+ some bug fixes to new one
 2020-04-18 17:38:26 -07:00
Moe d76edce8ad Delete main.dash2.js 2020-04-16 23:15:38 -07:00
Moe 3c849f73d5 refactor for region editor js 2020-04-16 23:15:31 -07:00
Moe cca53bde4c update dashboard clock performance 
- remove last bit of jquery
 2020-04-06 18:12:51 -07:00
Moe ffb93e8a4a update dashboard clock performance 
- use pure js for all operation except the on click event to change the class for twentyfourhours
 2020-04-06 18:10:52 -07:00
Moe acdc40e545 Merge branch 'fix-scrolling' into 'dev' 
Fix scrolling when clicking thumbnail.

See merge request Shinobi-Systems/Shinobi!45
 2020-04-06 17:05:54 +00:00
Moe d6ab68059f Update default aduration and probesize 2020-04-05 22:41:29 -07:00
Moe f787c66ad7 Set default Stream Type to HLS 2020-04-05 19:29:53 -07:00
Moe a0a3ef2d2a Disable timelapse download auto-rerun 2020-04-05 16:16:22 -07:00
Moe 8252886272 prepare more P2P pathing 2020-04-05 16:14:31 -07:00
Moe b478bb92c0 Mute Audio on Monitors individually (dashboard UI) 2020-04-04 16:59:18 -07:00
Moe eeb4cdfe0d add P2P UI loading handlers+, update mjpeg grid to not need "full=1" 2020-03-07 23:13:05 -08:00
Moe 932095bf71 add P2P UI loading handlers 2020-03-07 19:23:29 -08:00
JordanGeoghegan f5f89e6d74 Fix longstanding issue with incorrect file size calculation 2020-01-31 18:30:24 -08:00
Jordan Geoghegan 1f592d38da There are 1048576 bytes in a mebibyte, not 1000000. Fixes physical RAM display in dashboard. Tested on OpenBSD and Alpine Linux 2020-01-23 21:48:20 +00:00
Jordan Geoghegan 68bc043051 There are 1048576 bytes in a mebibyte, not 1000000. Fixes physical RAM display in dashboard. 
Tested on OpenBSD and Alpine Linux
 2020-01-21 02:24:46 +00:00
Moe 62f2dab693 add Open All Monitors to menu 2020-01-10 15:39:44 -08:00
Moe ccd5e252d6 fix powervideo breakage on object event with no matrices 2019-12-22 07:56:24 +06:00
Moe 4d1a2d4977 Allow HLS playback on iOS 
- You may disable JPEG API/JPEG Mode if you use HLS as your Stream Type, this method has been tested to work on iOS 13.1.3
 2019-12-14 13:46:31 +06:00
Moe 759a3702b0 Fix duplicated monitor bug 
+ remove extraneous element
 2019-11-07 10:45:00 -08:00
Moe 662ddedef1 dummy fill missing reason field for event 2019-10-30 14:34:37 -07:00
Moe 797b63581b Merge branch 'update_daterangepicker' into 'dev' 
Update Date Range Picker and Moments

See merge request Shinobi-Systems/Shinobi!130
 2019-10-28 00:35:59 +00:00
Mike Hurley 1b348f7ae4 Update daterangepicker.css to version 3.0.5 2019-10-18 17:28:34 +00:00
Mike Hurley cf797adb0c Update daterangepicker.js to version 3.0.5 2019-10-18 17:27:26 +00:00
Mike Hurley ed3062d4b5 Update moment-with-locales.min.js to version 2.24.0 2019-10-18 17:26:02 +00:00
Mike Hurley 620eeb8da2 Update moment.js to version 2.24.0 2019-10-18 17:23:37 +00:00
Moe 621e58a1c9 fix missing variable for import in multimon 2019-10-17 10:15:27 -07:00
Moe a2dcccd9b9 fix monitor import base object 
+ add copy stream channels
 2019-09-23 15:58:33 -07:00
Moe 4a1789ae89 add m3u8 import capability to multimon+ 
- make it compatible with older buffer types
 2019-09-23 15:08:06 -07:00
Moe 8980a65805 add m3u8 import capability to multimon 2019-09-23 12:09:04 -07:00
Moe 0b9a6d03d4 fix timelapse pointer 2019-09-07 23:18:53 -07:00
Moe 3fa689ce1d remove $.ajax and use regular XHR in downloadAndZip 2019-09-06 17:28:54 -07:00