Isaac Connor
|
df657db65c
|
Add bookwork support
|
2023-06-27 15:06:42 -04:00 |
iconnor
|
38d0cf46fb
|
Merge branch 'fix_ffmpeg5_deprecations'
|
2023-06-27 14:57:29 -04:00 |
|
iconnor
|
62789a83ab
|
Implement more fixes for ffmpeg5 channel deprecations.
|
2023-06-27 13:20:19 -04:00 |
|
Isaac Connor
|
47ebf929cc
|
Actualy populate Name, Email, Phone inputs
|
2023-06-27 11:55:21 -04:00 |
|
Isaac Connor
|
3714b38caa
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-06-27 11:47:03 -04:00 |
|
Isaac Connor
|
961f05b228
|
Don't show deleted monitors in group dropdowns
|
2023-06-27 10:45:13 -04:00 |
|
Isaac Connor
|
bc1214e8e5
|
Don't use empty because it tests for false, and 0 is false. Just check for empty string. Fixes #3732
|
2023-06-27 10:44:25 -04:00 |
|
Isaac Connor
|
93dc57401f
|
Remove duplicated ExistsInFileSystem label
|
2023-06-26 10:34:19 -04:00 |
|
Isaac Connor
|
ccdbb8edf6
|
Improve Avigilon detection
|
2023-06-22 13:31:01 -04:00 |
|
Isaac Connor
|
96cb564354
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-06-22 13:18:28 -04:00 |
|
Isaac Connor
|
139315776d
|
Fix searching by monitor name
|
2023-06-22 13:13:19 -04:00 |
|
Isaac Connor
|
9606b1d855
|
version to version.txt
|
2023-06-21 19:01:36 -04:00 |
|
Isaac Connor
|
28e23b035c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-06-21 18:59:50 -04:00 |
|
Isaac Connor
|
7ebca529b5
|
Put back copying over generated .sql files. They don't get included with *.sql
|
2023-06-21 18:59:43 -04:00 |
Isaac Connor
|
2f2c488e5a
|
Merge pull request #3725 from Simpler1/patch-1
Fix(monitor.css): Narrow layout for pills-tab
|
2023-06-20 13:02:43 -04:00 |
|
Isaac Connor
|
20d1f1fd4b
|
Merge pull request #3729 from Simpler1/patch-5
Help text for OPTIONS_ALARMMAXFPS
|
2023-06-20 12:56:42 -04:00 |
Simpler1
|
fa68fc3894
|
Merge remote-tracking branch 'origin/patch-4' into patch-5
|
2023-06-19 11:36:39 -04:00 |
Simpler1
|
2d07098e1b
|
Add Help text for OPTIONS_ALARMMAXFPS
Previously this was pointing to the same text as OPTIONS_MAXFPS.
|
2023-06-19 11:33:20 -04:00 |
|
Simpler1
|
40a4d5266e
|
Add Help for OPTIONS_ALARMMAXFPS
Pulled text from ReadTheDocs.
|
2023-06-19 11:29:31 -04:00 |
|
Isaac Connor
|
070b70c26b
|
Handle ffmpeg5 channel deprecations
|
2023-06-19 10:57:13 -04:00 |
|
Isaac Connor
|
9541f44a83
|
Add bookworm to package building
|
2023-06-19 09:11:51 -04:00 |
|
Simpler1
|
80373f8f44
|
Fix(event): Consistent cookie timeframe
Sets cookie timeframe from one hour to two years (consistent with other cookie settings).
|
2023-06-14 19:23:14 -04:00 |
|
Simpler1
|
4c28b16c4b
|
Remember Events table settings
Fixes #3671
|
2023-06-14 19:19:58 -04:00 |
|
Simpler1
|
ed1a4c249d
|
Fix(monitor.css): Narrow layout for pills-tab
Fixes issue #3714
|
2023-06-14 19:13:42 -04:00 |
|
Isaac Connor
|
551f579501
|
Remove chowning /usr/share/zoneminder. Its bad.
|
2023-06-12 13:27:53 -04:00 |
|
Isaac Connor
|
e18fed2576
|
Spelling, fix missing db in database create for bullseye, add bookworm instructions
|
2023-06-12 11:53:21 -04:00 |
|
Isaac Connor
|
0a0293f34a
|
Turn warning about mismatched dimensions into a debug
|
2023-06-12 10:17:11 -04:00 |
|
Isaac Connor
|
02bb120f6e
|
version has been moved to version.txt
|
2023-06-12 09:44:32 -04:00 |
|
Isaac Connor
|
f8915aa363
|
Update to reflect the change of version to version.txt
|
2023-06-12 09:35:07 -04:00 |
|
Isaac Connor
|
a10e1d51d2
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-06-12 09:24:57 -04:00 |
|
Isaac Connor
|
b20159d980
|
Move version to version.txt
|
2023-06-12 09:23:10 -04:00 |
|
Isaac Connor
|
32ffee0a75
|
When waiting for capture, output text images saying so with a keepalive frequency
|
2023-06-12 09:22:16 -04:00 |
|
Isaac Connor
|
2aa5de8d51
|
Sync up with zm_utils version
|
2023-06-10 12:19:52 -04:00 |
|
Isaac Connor
|
3934bdda9d
|
Add other files that are new since 0.6.0
|
2023-06-10 08:34:36 -04:00 |
|
Isaac Connor
|
d29ef0e26b
|
Update jwt-cpp to v0.7.0-rc.0 to fix build on openbsd
|
2023-06-10 08:32:43 -04:00 |
|
Isaac Connor
|
87fbc96609
|
Fix where error_log write to to include path
|
2023-06-09 19:37:47 -04:00 |
|
Isaac Connor
|
19128eee18
|
Do not allow directory names in ZM_LOG_DEBUG_FILE. Only log to ZM_LOG_DIR
|
2023-06-09 17:27:54 -04:00 |
|
Isaac Connor
|
66d7f88edf
|
Clean up help text for ZM_LOG_DEBUG_FILE to not say that it can include a directory. It should be JUST a filename.
|
2023-06-09 17:27:54 -04:00 |
|
Isaac Connor
|
2b34fa67db
|
Add jpeg writing from YUV subpixelformat
|
2023-06-09 16:42:33 -04:00 |
|
Isaac Connor
|
ff24986d5c
|
Rename version to version.txt because it conflicts with newer compilers
|
2023-06-09 16:41:56 -04:00 |
|
Isaac Connor
|
8a00be8cc8
|
Load the ZM::Event using the Event Model data instead of loading by Id which goes back to db.
|
2023-06-09 10:53:10 -04:00 |
|
Isaac Connor
|
c811f1bc90
|
Load event using find_one which does caching.
|
2023-06-09 10:52:39 -04:00 |
|
Isaac Connor
|
2cb697f0e9
|
Debug alarm.jpg path when not found. Spacing. Remove unused Monitor variable
|
2023-06-09 10:40:34 -04:00 |
|
Isaac Connor
|
f8ca7cee94
|
Cleanup constructor a bit
|
2023-06-08 10:58:08 -04:00 |
|
Isaac Connor
|
14eb38a00b
|
add timeout value to debug, only send scale command if it is > 0
|
2023-06-08 10:30:01 -04:00 |
|
Isaac Connor
|
8485f19f86
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-06-08 09:17:23 -04:00 |
|
Isaac Connor
|
59ff7f3a31
|
Improve logged wrt insufficient permissions
|
2023-06-08 09:17:16 -04:00 |
|
Isaac Connor
|
986c6eb544
|
Merge pull request #3720 from SteveGilvarry/FixBuilds
Fix Builds
|
2023-06-07 20:45:58 -04:00 |
|
Isaac Connor
|
14d42ebb3e
|
Merge pull request #3723 from clipo1979/master
Update fail2ban.rules
|
2023-06-07 20:05:54 -04:00 |
clipo1979
|
6aa817116c
|
Update fail2ban.rules
Update to add working rule for changes from version 1.35+
|
2023-06-07 21:39:20 +01:00 |