Isaac Connor
|
c210453e27
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-07-09 08:22:15 -04:00 |
|
Isaac Connor
|
b4c871dc09
|
Always re-apply the latest update. Mainly because sometimes Isaac forgets to add the zm_update file when bumping versions, also in release branches, we increment version before release. zm_update scripts are always supposed to be re-runnable, so this is ok, if a little skeezy
|
2024-07-09 08:21:08 -04:00 |
|
Isaac Connor
|
7665c63da0
|
Add datetime as a zms option
|
2024-07-09 08:14:15 -04:00 |
|
Isaac Connor
|
a993ddb584
|
POpulateFrame can be const
|
2024-07-09 08:13:16 -04:00 |
|
Isaac Connor
|
cb35a6dd90
|
Handle case when OLD.DiskSpace is NULL
|
2024-07-09 08:12:52 -04:00 |
|
Isaac Connor
|
89b19d2439
|
Limit segfaults to 1
|
2024-07-08 08:53:44 -04:00 |
|
Isaac Connor
|
63a2ed4b06
|
Take Importance into accoutn when logging Unable to read from stream
|
2024-07-08 08:39:41 -04:00 |
|
Isaac Connor
|
caeb65233e
|
Fix not being able to unset use WallClockTimestamps
|
2024-07-08 08:36:55 -04:00 |
|
Isaac Connor
|
e508d7d63a
|
Merge branch 'wallclock_timestamps'
|
2024-07-07 09:03:49 -04:00 |
|
Isaac Connor
|
7d685e96df
|
Add db updates for WallClockTimestamps for 1.37.62
|
2024-07-07 09:03:31 -04:00 |
|
Isaac Connor
|
007b8bebbf
|
Limit viewable filesystem to defined storage areas
|
2024-07-06 17:52:43 -04:00 |
|
Isaac Connor
|
617d87b7e7
|
Bump version to 1.37.62 for WallClockTimestamp feature
|
2024-07-06 17:52:18 -04:00 |
|
Isaac Connor
|
53122eba85
|
Add WallClockTImestamps to actual SQL load
|
2024-07-06 17:51:38 -04:00 |
|
Isaac Connor
|
ca770b9cd7
|
If WallClockTimetsamps is set, use the wallclock timestamp in the ZMPacket to override ptd, dts in the packet. Please note that it gets converted to in_stream->timebase and then to out_stream time_base.
|
2024-07-06 17:21:20 -04:00 |
|
Isaac Connor
|
cbe0c7c9e2
|
Add loading wallclock setting from db and provide accessor function
|
2024-07-06 17:20:31 -04:00 |
|
Isaac Connor
|
716a7bae61
|
Only show WallClockTimestamps option for passthrough
|
2024-07-06 08:53:15 -04:00 |
|
Isaac Connor
|
200ba2322f
|
Add WallClockTimestampts to monitor edit under recording options
|
2024-07-06 08:51:58 -04:00 |
|
Isaac Connor
|
a3c73b414f
|
Add WallCLockTimestamps to Monitor model
|
2024-07-06 08:51:37 -04:00 |
|
Isaac Connor
|
84e1869fb8
|
Add ELOC substitution to get Latitude and Longitude of event
|
2024-07-05 17:28:59 -04:00 |
|
Isaac Connor
|
481210feaf
|
Rough in web ui api documentation. Add download event video documentation.
|
2024-07-05 15:37:12 -04:00 |
|
Isaac Connor
|
474abe6ed6
|
Fix test for whether ptz button is disabled
|
2024-07-05 09:46:34 -04:00 |
|
Isaac Connor
|
c369826fbf
|
Always show ptz button, just disbabled with useful tooltip
|
2024-07-05 09:34:52 -04:00 |
|
Isaac Connor
|
55d80d50d7
|
Use monitors instead of monitorData as the array to traverse. Somehow we end up with there not being an entry in monitors when there is one in monitorData. Maybe when visibility events occur during InitPage? Anyways, if we are actually traversing monitors, then we should do so in the for loop.
|
2024-07-04 10:44:00 -04:00 |
|
Isaac Connor
|
4cfef05693
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-07-04 10:24:53 -04:00 |
|
Isaac Connor
|
174fb6ccf0
|
Remove warning about not getting packet lock
|
2024-07-04 10:24:28 -04:00 |
Isaac Connor
|
a88065f2dd
|
Merge pull request #4085 from IgorA100/patch-152
Feat: Added the ability to save objects and arrays in cookies using JSON (skin.js)
|
2024-07-04 10:07:52 -04:00 |
IgorA100
|
87d31a1d77
|
Updated comment (skin.js)
|
2024-07-04 17:03:53 +03:00 |
|
IgorA100
|
837b17cc4e
|
Chore: eslint (skin.js)
|
2024-07-04 16:45:23 +03:00 |
|
IgorA100
|
415e5e9f0a
|
Code optimization (skin.js)
|
2024-07-04 16:40:17 +03:00 |
|
IgorA100
|
afeddf57f5
|
Added the ability to save objects and arrays in cookies using JSON (skin.js)
|
2024-07-04 16:35:22 +03:00 |
|
Isaac Connor
|
1874c2b968
|
Add last_duration to warning about non increasing dts
|
2024-07-03 08:55:04 -04:00 |
|
Isaac Connor
|
aa1aee230f
|
If camera time jumps back more than 10 seconds, fail the capture.
|
2024-07-03 08:54:46 -04:00 |
|
Isaac Connor
|
efbe6ab219
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-07-03 08:42:41 -04:00 |
|
Isaac Connor
|
6cf84df1e0
|
Add credentials function to Control.pm so it is available to all controls
|
2024-06-28 14:34:29 -04:00 |
|
Isaac Connor
|
43e21a3200
|
Update auth_hash in zms url
|
2024-06-28 14:33:59 -04:00 |
|
Isaac Connor
|
9aea4aea9f
|
Remove & from functions taking a shared_ptr
|
2024-06-28 14:33:34 -04:00 |
|
Isaac Connor
|
47eff20c1d
|
Fix misplaced </div> for Groups Permissions
|
2024-06-28 11:50:51 -04:00 |
|
Isaac Connor
|
05308eca77
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-06-28 09:40:56 -04:00 |
|
Isaac Connor
|
2755e5044f
|
Don't pass shared_ptr by ref. Defeats the ref counting
|
2024-06-28 09:40:49 -04:00 |
|
Isaac Connor
|
9d6d25632c
|
Merge pull request #4084 from ogumemura/patch-1
Update charset header in ja_jp.php from Shift_JIS to UTF-8
|
2024-06-28 08:13:20 -04:00 |
Shobu UMEMURA
|
2525ef7641
|
Update charset header in ja_jp.php from Shift_JIS to UTF-8
Given that most Japanese servers now use UTF-8, it makes sense to set UTF-8 as the default charset.
|
2024-06-28 18:09:55 +09:00 |
|
Isaac Connor
|
193a78264d
|
Fix setting level by encoder params. Add setting gop size
|
2024-06-27 17:03:17 -04:00 |
|
Isaac Connor
|
f4e30054d7
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2024-06-27 16:02:09 -04:00 |
|
Isaac Connor
|
6085782221
|
Handle setting h264 level in encoder params, instead of hard coding 32.
|
2024-06-27 16:01:47 -04:00 |
|
Isaac Connor
|
d98d3d3637
|
convert image_size to size_t and use correct formatters. Fixes warnings on 32bit
|
2024-06-27 16:00:51 -04:00 |
|
Isaac Connor
|
af76a27c0c
|
Add check for pkt being not null in ZM_DUMP_PACKET
|
2024-06-27 15:52:42 -04:00 |
|
Isaac Connor
|
b1d0b57f61
|
test for zm_terminate in event run loop as well in order to reduce backtraces on segfault
|
2024-06-27 08:21:51 -04:00 |
|
Isaac Connor
|
e7d6b53697
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-06-27 08:16:47 -04:00 |
|
Isaac Connor
|
56dec01eef
|
Fix summary email inline images not working.
|
2024-06-27 08:11:33 -04:00 |
|
Isaac Connor
|
065d73266b
|
Dont use t as an alias for Users
|
2024-06-26 18:03:21 -04:00 |