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
9541f44a83
Add bookworm to package building
2023-06-19 09:11:51 -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
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
Isaac Connor
81b9ac5efd
Ignore inherit on monitor permission. We were returning true instead
2023-06-07 16:00:27 -04:00
Isaac Connor
7a21c01f36
Don't show bandwidth options if there are none to choose from
2023-06-07 16:00:02 -04:00
Isaac Connor
3dbd68886a
Reload user using zm\User object methods
2023-06-07 15:59:46 -04:00
Isaac Connor
3491a99fc3
ServerId can be null so must have quotes around it
2023-06-07 11:33:59 -04:00
Isaac Connor
2a3b16076c
Fix missing %s in format string
2023-06-07 10:02:50 -04:00
Isaac Connor
d264985a36
Be more specific about which permission failed, providing a better log message
2023-06-07 09:54:58 -04:00
Isaac Connor
0ff6769262
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-06-06 11:47:32 -04:00
Isaac Connor
4bf258b7ea
Add the other submodule tarballs
2023-06-06 11:24:22 -04:00
Isaac Connor
6c8863b415
Merge pull request #3722 from mgulick/libgsoap_debian_bookworm
...
distros/ubuntu2004: Update libgsoap dependency for Debian 12
2023-06-05 18:54:37 -04:00
Mike Gulick
9de76cf3fd
distros/ubuntu2004: Update libgsoap dependency for Debian 12
...
Allow libgsoap-2.8.124, as that is what is shipped with Debian 12.
This fixes do_debian_package.sh on Debian 12.
2023-06-05 18:30:42 -04:00
Isaac Connor
4f416edf93
Fix missing auth_relay on alarm xhr
2023-06-05 09:57:12 -04:00
Isaac Connor
6148b805f6
Don't update non-existent Server entry
2023-06-04 09:43:32 -04:00
Isaac Connor
424aa13fed
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-06-04 07:50:36 -04:00
Isaac Connor
28d6a9915c
Fix eslint by finishing the intended code. The idea is to autmatically populate dhcp-range based on the ip set on the interface. This is unlikely to every happen due to defaults. Perhaps the code should simply check for the existence of the specified ip and flag the error
2023-06-04 07:50:29 -04:00
Isaac Connor
ecd2049997
Fix == to -
2023-06-04 07:23:08 -04:00
Isaac Connor
4671949532
Fix inverted Delete logic
2023-06-04 07:18:58 -04:00
Steve Gilvarry
7226b4b1f1
Fix Builds
...
-Remove docker images that don't exist yet
-Swap back to packpack dockerhub, dependencies should be installed by packaging so we shouldn't need our own dockers. I think the history was timeouts in travis, but github actions that is 360 hours.
2023-06-04 15:46:53 +10:00
Isaac Connor
6b9768f92c
Merge pull request #3718 from SteveGilvarry/UpdateMasterBuilds
...
Update master builds
2023-06-03 12:38:07 -04:00
Steve Gilvarry
4512fc0e31
Update master builds to build new distros. And remove extra line
2023-06-03 19:12:35 +10:00
Steve Gilvarry
3dfdec93fe
Update master builds to build new distros.
2023-06-03 19:10:54 +10:00
Isaac Connor
50be49b447
Make objdetect modals 65% width to make it easier to see
2023-06-01 14:49:00 -04:00
Isaac Connor
5c81538a09
remove fit-content on objdetect modal so we can scale it up to fit the screen better
2023-06-01 14:48:39 -04:00
