d80f397542
Create videoBrowser.js
2022-11-27 15:29:26 -08:00
17c87dcd46
Delete videobrowser.js
2022-11-27 15:29:19 -08:00
1bfff28763
Fix reading s.cloudDisksLoaded
2022-11-27 15:26:57 -08:00
e4b9b9bb35
renamed videobrowser to videoBrowser
2022-11-24 20:40:43 +02:00
8fbce6e47b
Add video browser api
2022-11-24 17:59:14 +02:00
0e4781b1a5
Merge branch 'fix-permissions' into 'dev'
...
Fix API Key Permissions
See merge request Shinobi-Systems/Shinobi!409
2022-11-23 20:33:39 +00:00
9f17d6d139
Fix API Key Permissions
2022-11-23 20:33:39 +00:00
52f4bf9a96
simplify bulk video delete
2022-11-22 18:13:31 -08:00
14b76a4e50
Disable Heartbeat log for P2P
2022-11-22 18:12:36 -08:00
e332929fd0
Fixing sending postData with control URLs. Fixed non-working stop command for PTZ control.
2022-11-18 15:43:55 -05:00
335cf7398e
Change use cases of fs.unlink with fs.rm
2022-11-16 21:10:26 +00:00
7be65d17d5
replace fs.unlink with fs.rm for file deletion
2022-11-16 07:52:49 -08:00
61cc2b050b
catch amazon file delete error
2022-11-14 10:10:13 -08:00
aad94d9898
Capture Base64 strings from smtp dropInEvent
2022-11-07 14:35:25 -08:00
78435d12a9
remove default a value from Event Counts table creation
2022-11-03 23:26:07 -07:00
3fd1e02e38
cleanup login post json response and add timezone param
2022-10-27 16:54:17 -07:00
1308fcbc78
update monitor status update when starting process
2022-10-27 16:09:54 -07:00
f864982cee
Fix Timezone Conversion in Dashboard
2022-10-23 04:07:47 +00:00
c360babc8c
Fix passage for failed activation request
2022-10-22 15:30:29 -07:00
649ed30fd2
update embed page write
2022-10-21 22:33:12 -07:00
3c7289db0b
Revert "Update amazonS3.js"
...
This reverts commit 1f80727362
2022-10-20 15:34:23 -07:00
1f80727362
Update amazonS3.js
2022-10-19 17:00:23 -07:00
dc247557b4
Add Video Slicer
2022-10-16 23:34:30 +00:00
a8c7d8182e
Merge branch 'video-slicer' into 'dev'
...
# Conflicts:
# web/assets/js/bs5.videosTable.js
2022-10-16 22:47:14 +00:00
b54d08ad36
add two more options to mqttOut trigger
...
+ insertCompletedVideoExtender
+ onEventBasedRecordingComplete
2022-10-11 20:20:04 -07:00
d97cc5b367
Add onEventBasedRecordingComplete extender
2022-10-11 20:14:59 -07:00
049beaceb5
Fix customAutoLoad loading pageBlocks
2022-10-11 20:14:33 -07:00
10bfce9563
Make Plugin Manager use conf.json for "Enabled" status
2022-10-08 18:49:31 -07:00
3a7d30e362
mild refactor for embed live stream feature
2022-10-08 16:28:12 -07:00
be973aaa7b
disable monitor auto restart on error if manually already restarted+
2022-10-02 20:26:47 -07:00
190d76bec1
Fix syntax bug in libs/control/ptz.js
2022-10-02 20:26:35 -07:00
5f3bf0df6e
disable monitor auto restart on error if manually already restarted
2022-10-02 20:13:22 -07:00
1321e8cfca
Show Completed Slicing after completion
2022-10-01 12:54:43 -07:00
b2ee975f29
Add Studio (Currently only a Video Slicer)
...
- only function set with basic UI to slice a video
2022-09-29 23:32:09 -07:00
48d7d6a99b
Upgrade permission check function
...
fixes videos appearing in Videos Table but cannot be played.
2022-09-28 13:39:25 -07:00
de18962860
add Fatal Error Exit notice, clean up fatal_max error check+
2022-09-27 14:11:15 -07:00
70ea243cba
clean up fatal_max error check
2022-09-27 13:53:02 -07:00
4edcf74c48
add delete button to fileBin table
2022-09-25 19:46:20 -07:00
9ce24bfd3c
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-09-24 14:23:55 -07:00
76f244d958
fix formData build for fetch
2022-09-24 14:23:47 -07:00
b992e536ba
minor cleanup
2022-09-24 14:19:25 -07:00
292055a9a3
Update Backblaze Videos to download proxied
2022-09-24 14:11:04 -07:00
642e06b9e7
Merge branch 'nocona-fix-event-based-recording' into 'dev'
...
Fix Event Based Recording Stutter for some cameras
See merge request Shinobi-Systems/Shinobi!390
2022-09-24 02:58:00 +00:00
ddc3fa3796
add log filters for monitor log
2022-09-18 14:38:47 -07:00
9661f019d0
adjust raw snapshot from detectorStream.m3u8
2022-09-14 19:21:45 -07:00
efe703dfc0
fix #410
2022-09-14 15:35:10 -07:00
abbb94899c
remove loadGroupApps from login
2022-09-14 10:00:38 -07:00
6cf4e332f9
add more specific catches for certain fatal errors
2022-09-12 19:56:25 -07:00
9fb1a602eb
Update libs/events/utils.js
2022-09-12 23:42:05 +00:00
5d727f0ac0
Update libs/ffmpeg/builders.js
2022-09-12 23:36:24 +00:00
2ff97d301d
Update libs/basic/utils.js
2022-09-12 23:33:15 +00:00
b13297bdfb
Update libs/ffmpeg/builders.js
2022-09-12 23:29:56 +00:00
b2981e2500
Update libs/events/utils.js
2022-09-12 23:28:08 +00:00
def2224544
Update libs/basic/utils.js
2022-09-12 23:23:56 +00:00
15fa2e8446
Update libs/events/utils.js
2022-09-12 00:00:08 +00:00
8263aa0e8a
Update libs/events/utils.js
2022-09-11 23:45:17 +00:00
b387fc0042
Update libs/ffmpeg/builders.js
2022-09-11 23:36:05 +00:00
ce224b4a1a
Update libs/ffmpeg/builders.js
2022-09-11 23:22:12 +00:00
2388b31fd6
Update libs/ffmpeg/builders.js
2022-09-11 23:15:14 +00:00
38d8b66e9a
Update libs/events/utils.js
2022-09-11 23:13:41 +00:00
c012a85856
Update libs/ffmpeg/builders.js
2022-09-11 23:12:55 +00:00
f6adf7738b
Update libs/events/utils.js
2022-09-11 23:10:48 +00:00
ee5a1aee1c
Update libs/basic/utils.js
2022-09-11 22:59:28 +00:00
91503ff9c5
Update libs/ffmpeg/builders.js
2022-09-11 22:53:54 +00:00
be016dee2a
add roundNearest5 to basic/utils.js
2022-09-11 15:52:13 -07:00
4cbdbfafe1
Update libs/events/utils.js
2022-09-11 21:33:51 +00:00
60cddb11fa
Update libs/events/utils.js
2022-09-11 21:29:18 +00:00
0e0eb4ab46
Update libs/events/utils.js
2022-09-11 21:23:39 +00:00
777d56bc3c
Update libs/ffmpeg/builders.js, libs/events/utils.js
2022-09-11 04:13:49 +00:00
8f90e4c2dd
Remove X-Powered-By in response header #408
2022-09-05 09:03:29 -07:00
178762c6d1
update permission check for ke/mid queries
2022-08-31 12:21:38 -07:00
b3a27f43e3
minor adjustment to onvif events init
2022-08-31 12:20:24 -07:00
0a11b5e680
Fix Streamer and Dashcam pages
2022-08-30 09:50:05 -07:00
519ab851e8
fix customAutoLoad front end library loader
2022-08-25 13:09:48 -07:00
a3048679b7
Fix #396 (MQTT Configuration Broken)
...
Changes suggested in https://gitlab.com/Shinobi-Systems/Shinobi/-/issues/396#note_1046194795
2022-08-22 10:37:21 -07:00
80f333ec81
fix missing column in Videos table
2022-08-21 11:16:16 -07:00
4a1817b421
Merge branch 'unused-file-cleanup' into 'dev'
...
Web UI Library Cleanup
See merge request Shinobi-Systems/Shinobi!378
2022-08-21 15:52:10 +00:00
f6e3b24a4d
update some archive preQueries
2022-08-20 14:54:33 -07:00
d840de2736
fix broken Monitors query
2022-08-20 14:52:52 -07:00
6908a3a757
Merge branch 'archive-videos' into 'dev'
...
Archive Feature
See merge request Shinobi-Systems/Shinobi!379
2022-08-20 18:00:22 +00:00
1bff50199b
Allow viewing only Archived videos in Videos page
2022-08-20 10:50:08 -07:00
ff3eaf8a09
Alter Event Filter execution
2022-08-20 10:29:35 -07:00
7442214efe
Add Button for FileBin file archival
2022-08-20 10:28:55 -07:00
8eb0326e5d
Add API Call to Delete and Archive FileBin files
2022-08-19 23:37:40 -07:00
16075f3d2e
Make cron.js ignore archived data
2022-08-19 23:17:44 -07:00
455e5706d3
Archive Associated Events and First Frame with Video
2022-08-19 23:14:39 -07:00
e5c35a7b4d
Video Recording Archive Controls
2022-08-19 17:38:24 -07:00
d63558993d
automatically remove Compression Video list item from side menu
...
if automatically told to compress
2022-08-18 22:22:08 -07:00
739f9d83b0
add description for auto compress
2022-08-18 21:48:20 -07:00
a6788fec79
Option to auto compress Continuous and Event-Based Recording
2022-08-18 19:00:29 -07:00
595385da54
fix #405
2022-08-17 11:13:33 -07:00
00bda917e4
Make Video Compression go into a Queue (group level)
2022-08-17 10:05:54 -07:00
ed2a5f750c
minor cleanup
2022-08-17 08:46:00 -07:00
f12181b903
Update startup.js
2022-08-17 08:45:21 -07:00
36ad3b5baf
fix webdav param names
2022-08-17 08:45:02 -07:00
4223c70a74
Basic Video Compression function with button to execute
...
- This function creates a new file based on encoding parameters and moves the original file to FileBin after completion.
- Future update will allow automatic compression requests
2022-08-16 09:20:02 -07:00
473bdb5798
remove old admin libs/asset loaders
2022-08-13 19:59:14 -07:00
70ce26d660
prepare for customAutoLoad assets
2022-08-13 19:54:45 -07:00
a45118c977
Fix orphan check at startup
2022-08-12 22:03:08 -07:00
5d5c4a9682
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-08-11 16:38:03 -07:00
f10ebdcfb5
Merge branch 'cron-as-worker-process' into 'dev'
...
Make cron.js a Worker Process
See merge request Shinobi-Systems/Shinobi!364
2022-08-11 05:50:27 +00:00
15f6eb8616
remove cron key warning
2022-08-10 22:42:02 -07:00
511fa91354
startup with a clean monitor object
2022-08-10 22:41:41 -07:00
54f0ef3674
Changes from !223 updated
2022-08-09 17:06:38 -07:00
637754e8c7
Changes from !223
...
Had to be manually merged because of Dashboard v3 framework change
2022-08-09 17:05:17 -07:00
ae9cd98636
Manually add changes from !329
...
- Had to manually add them because part of it already existed in the repository in a different method. Portions have been rewritten since as well; which required a manual merge.
2022-08-09 16:33:44 -07:00
5d9db1124b
Merge branch 'dev' into 'cron-as-worker-process'
...
# Conflicts:
# libs/socketio.js
2022-08-09 23:22:54 +00:00
87914222e6
Update socketio.js
2022-08-09 16:19:58 -07:00
55b850c6f7
add basic restrictor for cloud file delete
2022-08-09 08:24:49 -07:00
e3b1a9b4a4
Add getting Cloud Timelapse Frames through API
2022-08-08 15:16:59 -07:00
9f1bbca9b1
Update WebDAV uploader
...
+ timelapse frame uploads
+ proxy video data through Shinobi server on video GET for security and consistency
2022-08-08 10:15:58 -07:00
92ef41401a
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-08-08 07:18:23 -07:00
73cc0a0e83
change toggleSubstream permission to view instead of edit
2022-08-08 07:18:17 -07:00
eadeca8753
Merge branch 'fix/api-auth' into 'dev'
...
User details parsing fixed in editSession #362
See merge request Shinobi-Systems/Shinobi!360
2022-08-08 05:07:13 +00:00
cb31a0ee61
Merge branch 'dev' into 'dev'
...
Cleanup and Jquery update
See merge request Shinobi-Systems/Shinobi!376
2022-08-08 03:50:43 +00:00
3b17bc733a
Changed login splash image to a local avif
2022-08-08 12:45:00 +10:00
c3c97ce80b
Merge branch 'fix-sub-account-permissions' into 'dev'
...
Refactor Sub Account Permissions
See merge request Shinobi-Systems/Shinobi!377
2022-08-08 02:12:40 +00:00
428d17cf87
add some UI fixes for displaying Unauthorized features for Sub-Acc
2022-08-07 16:27:03 -07:00
e11edc7c89
cleanup and proxy video data for cloud videos (s3based, amazonS3)
2022-08-07 12:09:28 -07:00
55f2567976
Add Permission checks to Scheduler, Probe, and ONVIF Device Man
2022-08-06 11:18:46 -07:00
4e8300f3f9
Refactor Permission check for Sub-Accounts and API Keys
2022-08-05 23:20:08 -07:00
551834d8d7
update permission check system for Sub-Accounts (replace only some)
2022-07-31 17:58:10 -07:00
18137da4ab
tweak forced disconnection from p2p
2022-07-30 15:09:00 -07:00
575db0f054
fix file deletion when monitor is deleted
2022-07-29 21:22:40 -07:00
d23413f287
Fix request for ShinobiHub Private config auto backup
2022-07-25 12:16:37 -07:00
3787f759b4
Don't allow Max Storage Amount below 0
2022-07-24 07:36:47 -07:00
a0d7112025
make mqtt wait 10 seconds before reconnect
2022-07-24 07:36:15 -07:00
c0452b5416
Update Time lapse Frames Percent Checker
2022-07-24 07:36:04 -07:00
6a7c2ba0b9
Update amazonS3.js
2022-07-24 07:35:25 -07:00
0444dc9889
Make snapshot for Notification come before Video
2022-07-24 07:35:12 -07:00
e6d3f6e0dc
Update Appearance for Super User panel
...
- a Refactor for the actual code may be coming soon, however the goal with this is only to convert the appearance to match the style of Dashboard v3
2022-07-22 22:14:06 -07:00
bde04877b5
Allow adjusting Event-Based Recording Analyze Duration and Probe
2022-07-21 18:58:18 -07:00
5963d8c759
Add more buffer to insert time for Event-Based Video
2022-07-21 18:55:33 -07:00
d43767c2ae
Fix getting Cloud Uploaded Videos through Shinobi API
2022-07-20 12:13:36 -07:00
fd4cfa207c
Fix recording audio for Event-Based Recording
2022-07-19 22:15:01 -07:00
f0a317fb7c
Add credentials to snapshots for cameras that need it
2022-07-19 13:24:48 -07:00
0dbe456e5e
catch when activeMonitor details fails to propagate before merge
2022-07-18 22:56:23 -07:00
17e7fdc15a
Add Accuracy Mode for Motion Detection
2022-07-17 23:48:10 -07:00
9abe25fc02
Merge branch 'bugfix/memory-reports' into 'dev'
...
Fix issues of wrong CPU report on macOS and wrong memory on non-linux systems
See merge request Shinobi-Systems/Shinobi!366
2022-07-15 05:05:57 +00:00
dba7c78272
Merge branch 'dev' into 'dev'
...
proc and proc.stdin check
See merge request Shinobi-Systems/Shinobi!368
2022-07-14 05:41:34 +00:00
36fbf5621c
check proc and stdin support
2022-07-13 16:30:25 +00:00
dfb275cd2f
Fix CPU usage on macos
2022-07-10 21:09:17 -03:00
204169030a
Fix memory usage report on non-linux systems
2022-07-10 19:17:13 -03:00
8a27126c8b
update ONVIF Events toggle position to Detector Settings
...
- Only show if Detector Settings and ONVIF are enabled
2022-07-08 20:48:02 -07:00
85ab76178f
Add Fix button to reprocess Videos from Videos Table
...
- This is for when a video has become corrupt and you want to attempt making it playable with the content it has.
+ move stitchMp4Files function
2022-07-07 15:53:46 -07:00
87867373a5
disallow Timelapse video build without a Monitor ID
2022-07-07 12:33:19 -07:00
a6c8595550
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-07-07 09:58:20 -07:00
a1eeed4a4d
Setup Websocket Callback+
2022-07-07 09:56:55 -07:00
d9f26a22cc
Merge branch 'ssanri-master-patch-59109' into 'dev'
...
fix for error reported in scheduler when there are no scheduled events in database
See merge request Shinobi-Systems/Shinobi!365
2022-07-07 14:55:59 +00:00
267cd88500
fix for
...
```
0|camera | knexError----------------------------------- END
0|camera | TypeError: Cannot read properties of undefined (reading 'forEach')
0|camera | at /home/Shinobi/libs/scheduler.js:11:18
0|camera | at /home/Shinobi/libs/database/utils.js:159:33
0|camera | at __node_internal_ (node:util:281:10)
0|camera | at processTicksAndRejections (node:internal/process/task_queues:83:21)
0|camera | Uncaught Exception occured! Wed Jul 06 2022 03:58:06 GMT+0000 (Coordinated Universal Time)
```
2022-07-07 04:50:10 +00:00
Moe
Elad Bar
Joshua Seltzer
Katie Roberts
Gamertech
Serdar Sanri
Kennedy Oliveira