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
Moe
Gamertech
Serdar Sanri
Kennedy Oliveira