Isaac Connor
22cc015e31
Bump version to 1.37.44 for tags feature
2023-09-15 10:20:57 -04:00
Isaac Connor
ee379cb4e4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-15 10:15:58 -04:00
Isaac Connor
f16df49870
Merge pull request #3758 from Simpler1/tags
...
(feat): Tags
2023-09-14 17:17:38 -04:00
Isaac Connor
f8c89a0405
Merge branch 'master' into tags
2023-09-14 16:42:06 -04:00
Isaac Connor
b68ed6c135
Use UpdatedOn field of Monitor_Status to determine if info there is stale. Show offline if Monitor_Status hasn't been updated in over a minute.
2023-09-14 10:25:36 -04:00
Isaac Connor
d9601b1d69
Deprecate centos7
2023-09-13 14:33:12 -04:00
Isaac Connor
c9cb7d4ca4
deprecate buster and introduce bookworm
2023-09-13 14:32:23 -04:00
Isaac Connor
8703a5d9c8
deprecate buster and introduce bookworm
2023-09-13 14:31:56 -04:00
Isaac Connor
0447e606df
Deprecate bionic and introduce focal
2023-09-13 14:30:57 -04:00
Isaac Connor
a24f18f916
Deprecate bionic and introduce focal
2023-09-13 14:30:49 -04:00
Charlie Root
41dc7c8f4e
Fixes to not log errors when there are no monitors to display in watch.
2023-09-13 11:19:16 -07:00
Charlie Root
e11b700fbd
Add Id as a protected member, only lookup monitor status if Id has a value
2023-09-13 11:18:50 -07:00
Charlie Root
6754fcb208
Make Filter properties protected
2023-09-13 11:18:28 -07:00
Charlie Root
1c3206b781
Merge branch 'master' into openbsd
2023-09-13 10:15:06 -07:00
Charlie Root
fccebee056
Add -a to arp, add ZM_PATH_OUI for path to ieee-oui.txt
2023-09-13 10:14:49 -07:00
Charlie Root
c4302c27ac
Add code to test for existence of ip and support ifconfig
2023-09-13 10:14:21 -07:00
Isaac Connor
a58949ab32
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-13 13:10:37 -04:00
Isaac Connor
d9bf168066
Merge ../ZoneMinder.connortechnology
2023-09-13 13:10:14 -04:00
Isaac Connor
c6a7fe949a
Use different syntax for property access
2023-09-13 13:10:01 -04:00
Isaac Connor
d7090ce84a
Define properties
2023-09-13 13:08:12 -04:00
Isaac Connor
3767d815a5
Use different syntax for assigning object properties
2023-09-13 13:05:57 -04:00
Isaac Connor
ef402e7b99
Define tablename member
2023-09-13 13:05:39 -04:00
Isaac Connor
46ac2dba2f
Define tablename member
2023-09-13 13:05:25 -04:00
Isaac Connor
6a87f56ac2
Never display errors
2023-09-13 13:04:16 -04:00
Isaac Connor
7eb601ef4d
Restore audio recording
2023-09-13 10:47:45 -04:00
Isaac Connor
de8f387207
Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj
2023-09-13 10:12:04 -04:00
Isaac Connor
22d911940f
Remove deprecated reconnect setting for mysql
2023-09-12 15:10:34 -04:00
Isaac Connor
e353523073
Fix int()=>(int) causing events to not load
2023-09-12 09:07:46 -04:00
Charlie Root
da213d8532
Merge branch 'master' into openbsd
2023-09-11 13:42:43 -07:00
Charlie Root
50059e5842
Only show ram info if proc exists.
2023-09-11 13:42:22 -07:00
Isaac Connor
b7ed7a4bd8
in detaintPath also strip :// because php:// is a way to inject code
2023-09-11 12:34:31 -04:00
Isaac Connor
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
Isaac Connor
09081be010
Fix again the infinite loop in counting keyframes
2023-09-11 11:29:54 -04:00
Isaac Connor
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
David Schmidt
5bfa28d172
Use unique_ptr instread of local scope object pointer for second input
2023-09-09 18:51:54 +02:00
David Schmidt
320864d252
Implement get video and audio codec context
2023-09-09 18:51:36 +02:00
Isaac Connor
a13c9c06f2
Handle when filter limit is '0'
2023-09-09 12:38:47 -04:00
Isaac Connor
b1cdf9905c
Make notes clickable to bring up objdetect image like in events list
2023-09-09 12:37:27 -04:00
Isaac Connor
e53974119b
Ensure that group_id is defined
2023-09-09 12:08:44 -04:00
Isaac Connor
bf34db7da2
Log a warning when failed to send an email
2023-09-09 12:04:57 -04:00
Isaac Connor
b44216d3da
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-08 14:19:09 -04:00
Isaac Connor
a9997b943a
Use new event::find_virtual_frame when loading frames
2023-09-08 14:19:01 -04:00
Isaac Connor
cb5442d5b8
Add 704x576 aspect ratio to timeline css
2023-09-08 14:18:34 -04:00
Isaac Connor
82e972943e
Add frame loading including virtual frames
2023-09-08 14:18:11 -04:00
Isaac Connor
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
Isaac Connor
1f4ed44371
Fix infinite loop looking for keyframe interval
2023-09-08 14:16:31 -04:00
Isaac Connor
2b2c43e630
Merge pull request #3748 from Simpler1/patch-6
...
Refresh table on show
2023-09-05 13:05:36 -04:00
Isaac Connor
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
dependabot[bot]
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
Simpler1
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
