Commit Graph

3260 Commits (ffb511bd153592caffaaca99514e66181584cf2e)

Author SHA1 Message Date
Moe ffb511bd15 Manually merge !465 with some changes 2023-05-20 18:25:28 -07:00
Moe A d084745f43 fix regionEditor name change handler 2023-05-10 21:48:23 -07:00
Moe A 01717f799c Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-05-10 21:34:03 -07:00
Moe 7de7249850 fix popped-image overlay #472 2023-05-10 20:25:53 -07:00
Moe f7922269e4 Fix #480 2023-05-10 10:20:45 -07:00
Moe 870f8e1bc2 Fix broken timelapse frame write 2023-05-09 12:38:58 -07:00
Moe b08ec2ef98 add mysql2 package-lock.json 2023-05-08 08:52:06 -07:00
Moe dc35df0954 add mysql2 to package.json 2023-05-08 08:37:57 -07:00
Moe A d7af8dc112 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-05-07 12:06:32 -07:00
Moe A 1cc3d2e920 client side log flood handler disabled 2023-05-07 12:06:30 -07:00
Moe 8642ad1ce3 Update bs5.liveGrid.cycle.js 2023-05-03 12:21:27 -07:00
Moe 331c4011d0 allow configuring cycle interval 2023-05-03 12:18:37 -07:00
Moe 5f639f7fba Merge branch 'cycling-live-grid' into 'dev'
Cycling View for Live Grid

See merge request Shinobi-Systems/Shinobi!468
2023-05-03 19:08:43 +00:00
Moe b2fc57175c Cycling View for Live Grid 2023-05-03 19:08:42 +00:00
Moe A 369917b875 Fix Region Name display 2023-05-02 22:20:14 -07:00
Moe A 0861604bf6 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-05-01 20:54:00 -07:00
Moe 5e0ebed789 Merge branch 'move-group-select' into 'dev'
Move group select

See merge request Shinobi-Systems/Shinobi!463
2023-05-01 19:45:48 +00:00
Moe 5d527dbea1 Fix #474 2023-04-30 14:10:26 -07:00
Moe A 4174fabc3e fix menu being under some elements in mobile 2023-04-28 23:10:06 -07:00
Moe A 3522012f5a Recent Videos frame get optimization 2023-04-28 23:06:11 -07:00
Moe A cf0881aa79 Recent Videos cleanup+ 2023-04-28 22:52:50 -07:00
Moe A 6cdc0b08a3 and touch control for Recent Videos 2023-04-28 21:43:24 -07:00
Moe A d74091d52a Recent Videos cleanup 2023-04-28 21:43:09 -07:00
Moe A 8fc68d7489 minor optimization to Recent Videos 2023-04-28 21:29:50 -07:00
Moe A 26be77e96c Save Frame to Timelapse for Motion Detection+ 2023-04-27 11:23:13 -07:00
Moe A 79482501ec Save Frame to Timelapse for Motion Detection 2023-04-26 22:38:33 -07:00
Moe d6d1c0848f set default Stream Type to HLS again 2023-04-19 15:57:14 -07:00
Moe 175fe8491b Add Single Download and View to Power Viewer 2023-04-19 10:04:10 -07:00
Moe d627e1ce92 minor tuning to Power Video
- add download button for currently playing videos
- make it force all playing videos to be half the width of the container. This will force 2 playing videos per row rather than squishing all into 1 row.
2023-04-19 09:22:57 -07:00
Moe a3c3f23c3c Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-04-13 11:58:03 -07:00
Moe d7e0ade2d0 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-04-11 13:02:47 -07:00
Moe 1ca8edd78b auto close snapshot worker after 10 seconds if left hanging 2023-04-11 13:02:43 -07:00
Mohammad Ghayeni 97c0b95bf4 move monitor groups button to top 2023-04-11 13:54:33 +03:30
Mohammad Ghayeni aa11814ea8 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into contribution 2023-04-10 15:37:58 +03:30
Moe 63c00588bd Merge branch 'docker-nonroot' into 'dev'
Allow docker image to run as non-root

See merge request Shinobi-Systems/Shinobi!462
2023-04-10 01:37:58 +00:00
Felix Eckhofer 0f4b4321af
Allow docker image to run as non-root 2023-04-08 16:47:49 +02:00
Moe c837cdc109 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-04-06 12:10:46 -07:00
Moe f6c34befa2 add protocol prefix to s3-based endpoint 2023-04-06 12:10:38 -07:00
Moe 68d1683fd8 Merge branch 'default-super-config-values' into 'dev'
Fix super config default values

See merge request Shinobi-Systems/Shinobi!459
2023-04-06 17:11:25 +00:00
Elad Bar 12151602ef Fix super config default values 2023-04-06 17:11:25 +00:00
Moe a9ad989873 Merge branch 'droptimelapseframes' into 'dev'
Droptimelapseframes

See merge request Shinobi-Systems/Shinobi!456
2023-03-30 03:30:31 +00:00
Moe a79976142b fix reverted packages in package.json 2023-03-29 10:55:58 -07:00
Moe 1a70e8888c add README viewer to plugin manager 2023-03-29 09:36:49 -07:00
Moe 02cc30be4e Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2023-03-28 08:43:30 -07:00
Moe 4ce0eb1415 make Poseidon the default Stream Type 2023-03-28 08:43:12 -07:00
Moe e22713033d update convertJsonToAccordionHtml 2023-03-28 08:42:58 -07:00
Moe 47c462bca4 Merge branch 'fix-typo-splitforffmpeg' into 'dev'
Fix typo splitforffmpeg

See merge request Shinobi-Systems/Shinobi!461
2023-03-28 15:26:24 +00:00
Unicate 545a6f64ff fix typo for function splitForFFMPEG 2023-03-28 09:11:21 +07:00
Moe a15fe04ace update mp4frag 2023-03-26 23:31:21 -07:00
Moe b2b6d4b3f8 Merge branch 'dev' into 'dev'
Proposal to resolve error where postData was being sent on a GET request.

See merge request Shinobi-Systems/Shinobi!449
2023-03-19 17:22:23 +00:00