7eb601ef4d
Restore audio recording
2023-09-13 10:47:45 -04:00
de8f387207
Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj
2023-09-13 10:12:04 -04:00
22d911940f
Remove deprecated reconnect setting for mysql
2023-09-12 15:10:34 -04:00
e353523073
Fix int()=>(int) causing events to not load
2023-09-12 09:07:46 -04:00
da213d8532
Merge branch 'master' into openbsd
2023-09-11 13:42:43 -07:00
50059e5842
Only show ram info if proc exists.
2023-09-11 13:42:22 -07:00
b7ed7a4bd8
in detaintPath also strip :// because php:// is a way to inject code
2023-09-11 12:34:31 -04:00
a194fe81d3
Only allow Events Columns for sort. Fixes GHSA-2qp3-fwpv-mc96. Fixes GHSA-9cmr-7437-v9fj
2023-09-11 11:29:54 -04:00
09081be010
Fix again the infinite loop in counting keyframes
2023-09-11 11:29:54 -04:00
3146c30543
Merge pull request #3765 from d-bum/3764-improve-ffmpeg-camera-init
...
Fix #3764 - improve ffmpeg camera init
2023-09-09 12:57:26 -04:00
5bfa28d172
Use unique_ptr instread of local scope object pointer for second input
2023-09-09 18:51:54 +02:00
320864d252
Implement get video and audio codec context
2023-09-09 18:51:36 +02:00
a13c9c06f2
Handle when filter limit is '0'
2023-09-09 12:38:47 -04:00
b1cdf9905c
Make notes clickable to bring up objdetect image like in events list
2023-09-09 12:37:27 -04:00
e53974119b
Ensure that group_id is defined
2023-09-09 12:08:44 -04:00
bf34db7da2
Log a warning when failed to send an email
2023-09-09 12:04:57 -04:00
b44216d3da
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-08 14:19:09 -04:00
a9997b943a
Use new event::find_virtual_frame when loading frames
2023-09-08 14:19:01 -04:00
cb5442d5b8
Add 704x576 aspect ratio to timeline css
2023-09-08 14:18:34 -04:00
82e972943e
Add frame loading including virtual frames
2023-09-08 14:18:11 -04:00
473d34e220
Update events frameimage status code to use Event object. Make not finding the frame a debug because of bulk frames.
2023-09-08 14:17:36 -04:00
1f4ed44371
Fix infinite loop looking for keyframe interval
2023-09-08 14:16:31 -04:00
2b2c43e630
Merge pull request #3748 from Simpler1/patch-6
...
Refresh table on show
2023-09-05 13:05:36 -04:00
cd73060236
Merge pull request #3763 from ZoneMinder/dependabot/github_actions/actions/checkout-4
...
Bump actions/checkout from 3 to 4
2023-09-05 13:04:20 -04:00
1ea56ab70e
Merge pull request #110 from connortechnology/dependabot/github_actions/actions/checkout-4
...
Bump actions/checkout from 3 to 4
2023-09-05 13:03:26 -04:00
d8303f2168
Bump actions/checkout from 3 to 4
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-04 18:32:06 +00:00
1438c025b9
Bump actions/checkout from 3 to 4
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-04 17:11:40 +00:00
18d74ed7ac
(feat): Tags
...
fix(tag): Create tags on mobile
chore(tags): Change TagName to Name
chore(tags): eslint
chore(tags): dbFetchAll to dbQuery for removetag
chore(events): eslint (attempt 2)
feat(tags): Better handling of keyboard
fix(tags): Enter key for creating new tag
fix(tags): Don't allow space as a tag name
feat(tags): Delete tag if last assignment removed
fix(tags): Increase height of dropdown
in progress
fix(Tags): Use T.Id on the events page dropdown
fix(Tags): Remove $availableTags from events.php
chore(sql): Formatting sql statements
feat(Tags): Working OR on filters and events pages
fix(filter): Populate availableTags
chore(Tags): code formatting
fix(tag): Add tag on create tag
Fix(tags): Remove tag from available if last
feat(tags): Add zm_update.sql
fix(chosen): Undo css width
fix(chosen): tags dropdown width
fix(tags): dropdown over timeline
fix(tags): Full width input
fix(events): Refresh table on page show
chore(filter): Clean up availableTags
chore(event): Clean up available & selected Tags
fix(event): Update available tags on remove
fix(event): Remove hack for selected tags
feat(tags): Blur input after adding tag
doc(tags): Initial tags documentation
fix(tags): Dark theme dropdown
fix(tags): Dark theme for tags on input
fix(tags): Dark theme for highlight in dropdown
fix(tags): Populate filter tags droplist
chore(): Bump zm_update to 1.37.42
chore(tags): Move mobile check to skin.js
chore(tags): Comment debug statements
fix(tags): Enter key to create tag on mobile Chome
chore(tags): Space in 'All Tags' for translation
Temporary commit to handle cookie expiration times
chore(tags): Remove unnecessary Tag(s) from en_gb
chore(): Cleanup unnecessary Error and Debug
chore(): Resolve merge conflicts
chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
e5d125c4ef
Handle when no linefeed found
2023-08-31 12:46:12 -04:00
56999da3eb
Check for existence of path before scanning it generating a lot of erros
2023-08-30 14:38:43 -04:00
6331d79a73
Add visibility toggle for password inputs on user edit
2023-08-28 16:39:23 -04:00
df411c3fe3
Merge pull request #3760 from criadoperez/fix/texts
...
Text corrections
2023-08-27 13:17:08 -04:00
6fd119157a
Text corrections
2023-08-27 02:00:59 +02:00
cf713b59d7
Add 500 and 1000 as pagination options
2023-08-25 19:02:17 -04:00
79b755047a
Add db update to correct column type of Longitude in Events and Servers table
2023-08-25 12:49:14 -04:00
194c5a0628
Add another Annke Hikvision mac address
2023-08-25 10:54:44 -04:00
9132f8947d
If scale is 0 or negative, then start with scale=100
2023-08-23 16:32:39 -04:00
76d5646cbf
Fix scaling being constantly set to 0 and hence logging a bogus value for scale
2023-08-23 16:32:13 -04:00
1dba6115b1
Fix eslint
2023-08-23 11:44:16 -04:00
5953b88085
Count keyframes on queuePacket so that analysis Ready() will start when out of order packets are present
2023-08-23 11:41:54 -04:00
f5380f1423
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-22 12:38:28 -04:00
1e423c151d
Stop infinite recursion when fail to load logout modal.
2023-08-22 12:20:11 -04:00
67e2c80851
Check for existence of modal before including it.
2023-08-22 12:19:48 -04:00
26948b9387
Merge pull request #3756 from criadoperez/fix/branch1
...
Some text corrections
2023-08-19 09:09:18 -04:00
6d1d08ce27
texts corrections on distros
2023-08-19 12:51:05 +02:00
ac86c31d01
cmakecacheimport parameters
2023-08-19 12:41:07 +02:00
2e21c747d4
cmake corrections
2023-08-19 12:39:32 +02:00
491b48f9f9
Only allow execute if you have EditEvents permission
2023-08-18 16:58:29 -04:00
9371c2775d
Use canEdit and canDelete to allow users without canEditEvents to create filters that don't act on events, only list them.
2023-08-18 16:57:51 -04:00
94ea51489b
Add canDelete and canEdit functions to Filter
2023-08-18 16:57:08 -04:00
Isaac Connor
Charlie Root
Isaac Connor
David Schmidt
dependabot[bot]
Simpler1
Alejandro Criado-Pérez