81b9ac5efd
Ignore inherit on monitor permission. We were returning true instead
2023-06-07 16:00:27 -04:00
7a21c01f36
Don't show bandwidth options if there are none to choose from
2023-06-07 16:00:02 -04:00
3dbd68886a
Reload user using zm\User object methods
2023-06-07 15:59:46 -04:00
3491a99fc3
ServerId can be null so must have quotes around it
2023-06-07 11:33:59 -04:00
2a3b16076c
Fix missing %s in format string
2023-06-07 10:02:50 -04:00
d264985a36
Be more specific about which permission failed, providing a better log message
2023-06-07 09:54:58 -04:00
0ff6769262
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-06-06 11:47:32 -04:00
4bf258b7ea
Add the other submodule tarballs
2023-06-06 11:24:22 -04:00
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
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
4f416edf93
Fix missing auth_relay on alarm xhr
2023-06-05 09:57:12 -04:00
6148b805f6
Don't update non-existent Server entry
2023-06-04 09:43:32 -04:00
424aa13fed
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-06-04 07:50:36 -04:00
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
ecd2049997
Fix == to -
2023-06-04 07:23:08 -04:00
4671949532
Fix inverted Delete logic
2023-06-04 07:18:58 -04:00
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
6b9768f92c
Merge pull request #3718 from SteveGilvarry/UpdateMasterBuilds
...
Update master builds
2023-06-03 12:38:07 -04:00
4512fc0e31
Update master builds to build new distros. And remove extra line
2023-06-03 19:12:35 +10:00
3dfdec93fe
Update master builds to build new distros.
2023-06-03 19:10:54 +10:00
50be49b447
Make objdetect modals 65% width to make it easier to see
2023-06-01 14:49:00 -04:00
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
93ddf51cd7
Use ControlDevice for ChannelId. Update realm detection in PutCmd. Mostly debugging to see why a second put fails auth.
2023-06-01 10:00:51 -04:00
7f10c7060a
Fix hard coded monitor 5 in Add New Zone button
2023-06-01 07:56:43 -04:00
31d9342918
Assume reverse proxy setup for janus for http as well
2023-05-31 17:01:45 -04:00
0ded374bc3
Don't RTSP re-stream deleted monitos
2023-05-31 16:42:16 -04:00
f2009e4f38
Remove deprecated reference to MonitorIds from janus
2023-05-31 16:35:57 -04:00
993e8806c5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-31 15:04:45 -04:00
8a0c1bc379
Check to see if dnsmasq is installed
2023-05-31 15:04:42 -04:00
42df7c00ea
Fix left alingment of DHCP option
2023-05-31 15:04:04 -04:00
cd4461c5a5
Fix merging config values. Defaults to no, fix parsing config file
2023-05-31 15:03:50 -04:00
bfd86993e7
Add back logging, fix including = in value
2023-05-31 14:52:33 -04:00
43ed5f014f
Put dnsmasq layout options into a dnsmasq class
2023-05-31 12:35:52 -04:00
1370bfaddf
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-31 12:17:56 -04:00
1f9559922c
Don't watch deleted monitors
2023-05-31 12:17:49 -04:00
c3eccb4f96
Fix cspnonce
2023-05-31 12:08:08 -04:00
9141ea786d
left align config
2023-05-31 12:07:58 -04:00
4b82cf1d82
Don't check for file existence, just a value
2023-05-31 11:42:38 -04:00
b54a92da8e
Rough in automatic range setting from interface ip
2023-05-31 11:42:15 -04:00
c02cbd86f8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-31 09:16:32 -04:00
8bd3e5a3b1
Can't use ZM\Logger functions in config as it loads before logger.php.
2023-05-31 09:09:17 -04:00
5fc8bf0743
Any tables with bootstrap-table class gets the bootstrap-table treatment
2023-05-30 20:47:05 -04:00
ee0776c970
If configured, show dnmasq edit UI
2023-05-30 20:47:05 -04:00
7b2d8dc98c
Rough in UI for editing dnsmasq config
2023-05-30 20:47:05 -04:00
d277d6ca53
add formatting for dnsmasq edit
2023-05-30 20:47:05 -04:00
b0e29c9be7
Fix downloading of Ffmpeg type monitors
2023-05-30 20:47:05 -04:00
eab4d95e81
Always return an array from process_configfile instead of false on failure
2023-05-30 20:47:05 -04:00
bc4d625ca4
Add systemd_isactive
2023-05-30 20:47:05 -04:00
febf424259
Fix returning link_to
2023-05-30 20:47:05 -04:00
6204dfdecc
Fix start/stop/restart dnsmasq
2023-05-30 20:47:05 -04:00
Isaac Connor
Isaac Connor
Mike Gulick
Steve Gilvarry
Steve Gilvarry