ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,821 Commits
72 Branches
6 Tags
92 MiB
Commit Graph

825 Commits (4edcf74c48b398debae4676163171d3c7aff9dbd)

Author SHA1 Message Date
Moe ceda85e5db Update ZoneMinder Monitors Import+ 2022-08-11 16:43:29 -07:00
Moe 850b49e635 Update ZoneMinder Monitors Import 2022-08-11 16:37:59 -07:00
Moe 5c2a83b91d Fix bg from old merge 2022-08-10 21:38:59 -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 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 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
Antonín Skala e9b47f8da5
Add requestetd changes 2022-08-08 10:08:42 +02: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
Moe 6b3f2fc82e Add API Key Manager for Super User 2022-08-07 18:57:16 -07:00
Moe 428d17cf87 add some UI fixes for displaying Unauthorized features for Sub-Acc 2022-08-07 16:27:03 -07:00
Gamertech b39f84269a Adding <html>/<body> tags 2022-08-06 18:54:23 +10:00
Gamertech 72c6ea3ff1 Add doctype to login page 2022-08-06 18:43:14 +10:00
Gamertech bfb65a811f Cleanup and Jquery update 
Deleted old Bootstrap scripts
Updated to Jquery 3.6.0
Removed call to vis.js map file
Removed pre-Doctype comment that triggered IE9 quirks mode
 2022-08-06 14:05:09 +10:00
Antonín Skala f634ab394e
Status bar - Dynamic update of Active monitors 2022-08-05 12:07:39 +02:00
Gamertech ed02aa8d5d Matched package-lock.json 
Fixed console typo
Removed empty div breaking the normal-view header for Chrome and blocking favicon load
Removed call for non-existent stylesheet
 2022-08-05 18:13:10 +10:00
Moe 1112eb7284 minor cleanup to UI 2022-08-04 11:17:53 -07:00
Gamertech 2acf9ca998 Update /super logout icon and remove unused stylesheet. 2022-08-01 12:13:17 +00:00
Moe 2deb91bd9a Fix saving Trigger Camera Groups 2022-07-31 23:04:28 -07:00
Moe a61868fbb9 time-lapse viewer untick master checkbox if not all are selected 2022-07-30 18:44:50 -07:00
Moe 3f9ca074b7 minor tweak to time-lapse ui 2022-07-30 15:08:37 -07:00
Moe 3f783f826d Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-07-30 12:20:57 -07:00
Moe 2b334de481 make getAdminApiPrefix always available 2022-07-30 12:10:44 -07:00
Moe fbacafdd94 Add bulk deletion to time-lapse viewer and some minor cleanup 2022-07-30 12:09:10 -07:00
Moe 64679ea99b Merge branch 'swap-cpu-ram-icons' into 'dev' 
UI: Swap cpu/ram icons

See merge request Shinobi-Systems/Shinobi!372
 2022-07-30 16:03:32 +00:00
Antonín Skala d0f4374909
Swap cpu/ram icons 2022-07-30 10:04:04 +02:00
Moe 169d72f683 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-07-29 21:22:44 -07:00
Antonín Skala 5d660c4def
improve camera count readability 2022-07-29 23:12:52 +02:00
Antonín Skala e0319d2a62
Fix camera progress bar 2022-07-29 23:11:30 +02:00
Antonín Skala 3bfe1ff5c4
Fix disk indicator-percent 2022-07-26 17:08:04 +02:00
Antonín Skala 962a38bdc0
Add box-wraper to keep same layout 2022-07-26 17:00:39 +02:00
Moe e708488894 Hide options if P2P is disabled 2022-07-25 12:55:19 -07:00
Moe 1750f79757 Make Easy Remote Access status blocks only connect if enabled 2022-07-25 12:14:41 -07:00
Moe 9fd866bbbf Fix username overflowing in side menu 2022-07-24 09:53:32 -07:00
Moe e5b23fa2fe Fix label for No Trigger event in MQTT outbound 2022-07-24 08:51:15 -07:00
Moe c173ebf326 Make Super User login page appear with Green shade 2022-07-22 22:14:34 -07:00
Moe 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
Moe 70401b5631 Add uiVisibilityConditions for niche field visibility requirements 
+ fixes the missing settings for Stream Types that require encoding but did not swap the Video Codec when it was visible before selecting.
 2022-07-21 17:11:08 -07:00
Moe b52269b6b8 fix video appear upon completion for live grid blocks 2022-07-20 20:21:39 -07:00
Moe b1a5ad7c2c set super page logout button redirection to main login 2022-07-19 13:35:50 -07:00
Moe 17e7fdc15a Add Accuracy Mode for Motion Detection 2022-07-17 23:48:10 -07:00
Moe 5724c88a2e Fix double click to full screen live stream 2022-07-14 22:11:32 -07:00
Moe 1a65bb5627 fix drawing day cards with no frames 2022-07-14 11:06:04 -07:00
Moe 9560348d2f Undo breakage to dashboard-base 2022-07-13 20:55:55 -07:00
Moe ed289c992a Show a thumbnail that happened during the video in Videos Table 2022-07-13 20:54:21 -07:00
Moe ee31bc5d90 stop region editor live stream on tabAway 2022-07-12 19:10:08 -07:00
Moe 5a1ce93986 Fix Recent Videos not displaying if no videos but has frames 2022-07-12 19:09:48 -07:00
Moe bc8131ac30 make power video pause videos on tabAway 2022-07-12 19:09:20 -07:00
Moe 4289a2eff7 Fix Recent Videos performance hit if no data found on first scan 2022-07-12 17:59:14 -07:00
Moe d350ab7a05 Show placeholder image in Region Editor for Monitors not running 2022-07-12 15:24:09 -07:00
Moe 8778e2b582 Clean up regular video player ui 2022-07-12 15:14:39 -07:00
Moe 2c63c00019 Show videoPlayer detection better (not hide when hovering data) 2022-07-12 15:13:25 -07:00
Moe 4ab3eb76d3 Clean up regular video player ui and fix quick seek by event click 2022-07-12 15:09:14 -07:00
Moe 9438b16b27 Fix closing video player tab if video is deleted while its open 2022-07-12 15:08:46 -07:00
Moe c4d371d36d hide fix video button for now 2022-07-12 14:33:11 -07:00
Moe 86d02271ac Fix Power Viewer continuity 2022-07-12 14:26:34 -07:00
Moe ce8c6b1354 Fix Power Viewer over P2P 2022-07-12 11:59:24 -07:00
Moe d989dbcc25 Fix deleting monitor from Monitor Settings window 2022-07-12 11:13:01 -07:00
Moe 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
Moe 59664e7112 Add 7 Days and 30 Days search to Recent Videos 2022-07-07 12:32:25 -07:00
Moe f3cad3dca2 Make Recent Videos display loading icon 2022-07-07 12:31:59 -07:00
Moe 7741796f77 Cleanup Day Card video selection 2022-07-07 11:03:29 -07:00
Moe 521cb9bc77 Day Card only request frame if it isn't loaded or not already loading 2022-07-07 10:36:20 -07:00
Moe 2af8a2f3d8 Setup Websocket Callback 2022-07-06 21:24:49 -07:00
Moe 4a3eec7429 Setup Websocket Callback 2022-07-06 21:24:24 -07:00
Moe 8d42e1d18b make object list display in Videos table 2022-07-06 17:21:46 -07:00
Moe 9366d62090 Make Day Cards show if frames exist but no videos 2022-07-06 17:21:26 -07:00
Moe 450b7ab855 Option to Search for videos by Object Tag 
this feature will only work on detections and recordings made after this update is applied. Previous detections are not searchable in this way.
 2022-07-05 21:59:37 -07:00
Moe 5c920205f6 Fix Videos Table file links over p2p 2022-07-05 19:23:51 -07:00
Moe 222c13c3fc Save Live Grid positions when a tile is resized 2022-07-05 09:45:16 -07:00
Moe 39d99d0c95 Fix FileBin file links over p2p 2022-07-05 07:46:05 -07:00
Moe e8a11b7b12 Fix ONVIF Device Manager load first monitor on open 2022-07-04 22:13:27 -07:00
Moe 83750bb20e add timelapseVideoBuild to Websocket API 2022-07-04 20:29:26 -07:00
Moe 62d7b8d7f0 Fix onOtherWebSocketMessagesExtensions exec placement 2022-07-04 20:24:00 -07:00
Moe a50613c0b9 Fix dontShowDetection toggle state 2022-07-03 21:08:51 -07:00
Moe 364822f3a4 Lightly Refactor PTZ controls, Add PTZ Hold to move and release to stop 2022-07-03 13:50:16 -07:00
Moe 2537cf26ff Videos Table add button to launch Video Player with Events view 2022-07-01 19:54:24 -07:00
Moe 02871f86c5 ONVIF Scanner save monitor name as the IP Address 2022-07-01 19:45:17 -07:00
Moe 52c1b237ca clean up layout for Monitor Settings more 2022-07-01 19:43:57 -07:00
Moe 0ae6bc8419 Rename Traditional Recording to Event-Based Recording, + 
+ Re-arrange some fields and make them only show when advanced is toggled on in the Monitor Settings
+ removal of some unused fields
 2022-06-30 21:16:32 -07:00
Moe bb749f61e2 More descriptive Disk Usage indicator 2022-06-29 20:49:17 -07:00
Moe 6938850113 Display Usage for Videos, FileBin and Timelapse Frames in divided bar 2022-06-29 20:35:21 -07:00
Moe f3432d0b44 fix syntax error and minor cleanup ui 2022-06-29 19:42:04 -07:00
Moe 7610f9a4c6 minor cleanup 2022-06-29 18:13:31 -07:00
Moe 36943fa192 Add Batch Download and Delete to Videos table 2022-06-29 18:06:15 -07:00
Moe dea230e93a minor cleanup 2022-06-28 19:56:01 -07:00
Moe 30c595a37f Easy Remote Access page have link to "How to Connect" 2022-06-28 19:55:10 -07:00
Moe 371085a3ba fix some syntax errors 2022-06-28 18:43:53 -07:00
Moe 026ee4d6a2 use standard videos list for "Videos" tab 2022-06-27 23:33:00 -07:00
Moe 7fbb0cdfcb Add simple video viewer 2022-06-27 16:31:01 -07:00
Moe 8c9262a9f2 Better FileBin listing 2022-06-27 15:49:24 -07:00
Moe 9711472dda add quick play to built timelapse video, further cleanup 2022-06-27 15:03:55 -07:00
Moe 5f0b207003 timelapse video build progress indicator cleanup 2022-06-27 14:23:49 -07:00