Commit Graph

2702 Commits (739f9d83b06fda33cbb04ab787a1f3eb376b710e)

Author SHA1 Message Date
Moe 739f9d83b0 add description for auto compress 2022-08-18 21:48:20 -07:00
Moe a6788fec79 Option to auto compress Continuous and Event-Based Recording 2022-08-18 19:00:29 -07:00
Moe 0cecfbe643 minor cleanup 2022-08-17 21:15:22 -07:00
Moe 170075568d Add Compress to multiple selection action in Videos Table 2022-08-17 13:47:28 -07:00
Moe 8fe56bbed5 change compress icon 2022-08-17 13:12:32 -07:00
Moe fcbd5e94d0 add Monitor selector in the Monitor Settings tab 2022-08-17 13:12:19 -07:00
Moe 595385da54 fix #405 2022-08-17 11:13:33 -07:00
Moe 00bda917e4 Make Video Compression go into a Queue (group level) 2022-08-17 10:05:54 -07:00
Moe ed2a5f750c minor cleanup 2022-08-17 08:46:00 -07:00
Moe f12181b903 Update startup.js 2022-08-17 08:45:21 -07:00
Moe 36ad3b5baf fix webdav param names 2022-08-17 08:45:02 -07:00
Moe 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
Moe 54c5709509 failed theme load defaults to Ice-v3 2022-08-13 11:27:45 -07:00
Moe 17985499b2 remove less, sass, and scss 2022-08-13 11:22:37 -07:00
Moe 97daf7fa02 minor cleanup 2022-08-12 22:03:30 -07:00
Moe a45118c977 Fix orphan check at startup 2022-08-12 22:03:08 -07:00
Moe a02313ba77 Allow Importing ZoneMinder Zones with Monitor Configurations 2022-08-12 09:54:59 -07:00
Moe ceda85e5db Update ZoneMinder Monitors Import+ 2022-08-11 16:43:29 -07:00
Moe 5d5c4a9682 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-08-11 16:38:03 -07:00
Moe 850b49e635 Update ZoneMinder Monitors Import 2022-08-11 16:37:59 -07:00
Moe 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
Moe 15f6eb8616 remove cron key warning 2022-08-10 22:42:02 -07:00
Moe 511fa91354 startup with a clean monitor object 2022-08-10 22:41:41 -07:00
Moe 5c2a83b91d Fix bg from old merge 2022-08-10 21:38:59 -07:00
Moe 02e2244123 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-08-09 17:19:13 -07:00
Moe 38c128a4f1 Merge branch 'fix-camera-progress-bar' into 'dev'
UI: Fix camera progress bar

See merge request Shinobi-Systems/Shinobi!371
2022-08-10 00:18:59 +00:00
Moe 54f0ef3674 Changes from !223 updated 2022-08-09 17:06:38 -07:00
Moe 637754e8c7 Changes from !223
Had to be manually merged because of Dashboard v3 framework change
2022-08-09 17:05:17 -07:00
Moe 870c65d277 Merge branch 'dev' into 'dev'
Name Monitors in PowerVideoViewer by name not ID

See merge request Shinobi-Systems/Shinobi!315
2022-08-09 23:36:10 +00:00
Moe 693764e8a5 Add Czech Language file 2022-08-09 16:34:21 -07:00
Moe 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
Moe 5d9db1124b Merge branch 'dev' into 'cron-as-worker-process'
# Conflicts:
#   libs/socketio.js
2022-08-09 23:22:54 +00:00
Moe 87914222e6 Update socketio.js 2022-08-09 16:19:58 -07:00
Moe 55b850c6f7 add basic restrictor for cloud file delete 2022-08-09 08:24:49 -07:00
Moe e3b1a9b4a4 Add getting Cloud Timelapse Frames through API 2022-08-08 15:16:59 -07:00
Moe 220c55449d Add Toggle for Cloud Videos set in Videos Table 2022-08-08 14:10:20 -07:00
Moe 428666cc64 Add Permission checks for Live Stream block buttons 2022-08-08 11:53:35 -07:00
Moe 69d3392b15 Fix selecting Trigger Camera Groups 2022-08-08 11:18:05 -07:00
Moe 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
Moe 92ef41401a Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-08-08 07:18:23 -07:00
Moe 73cc0a0e83 change toggleSubstream permission to view instead of edit 2022-08-08 07:18:17 -07:00
Antonín Skala e9b47f8da5
Add requestetd changes 2022-08-08 10:08:42 +02:00
Moe 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
Moe c4627b3c62 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-08-07 21:26:35 -07:00
Moe 1dcf5607e2 fix selector bug on login page 2022-08-07 21:26:26 -07:00
Moe 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
Gamertech e6400611e0 Quick fix to splash image 2022-08-08 12:57:47 +10:00
Gamertech 3b17bc733a Changed login splash image to a local avif 2022-08-08 12:45:00 +10:00
Moe 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
Moe f4a5d4bc20 minor touch up to super user panel 2022-08-07 19:04:54 -07:00