26364 Commits

Author SHA1 Message Date
Isaac Connor
9c9a2dcb0b Update to use Control:: methods instead of our own duplicates 2025-11-07 16:24:00 -05:00
Isaac Connor
dcc2779882 Don't add extra / in get/post/put. Automatically populate BaseUrl and ua->credentials. Fall back to getting credentials from monitor->User and ->Pass 2025-11-07 16:23:51 -05:00
Isaac Connor
9da6a2e424 Year is 2 digit in deep mode 2025-11-06 21:26:08 -05:00
Isaac Connor
10901eb08f Remove extra line, use // to collapse lines 2025-11-06 21:25:40 -05:00
Isaac Connor
0234a43ff0 easoydocker is deprecated 2025-11-06 18:40:13 -05:00
Isaac Connor
f826f606bc Need a blank line to make toctree valid. 2025-11-06 18:40:13 -05:00
Isaac Connor
3e548b9040 Add restarting php-fpm 2025-11-06 16:48:58 -05:00
Isaac Connor
2ec110f036 Use latest commit for CxxUrl 2025-11-06 16:47:38 -05:00
Isaac Connor
e9a3500087 Fix eslint 2025-11-06 11:18:24 -05:00
Isaac Connor
351bd4d9ad Put back commented out skip_locked which came from 1.36 2025-11-06 11:16:01 -05:00
Isaac Connor
82212bef7b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-11-06 10:21:39 -05:00
Isaac Connor
da84ee80d8 Add EXPLAIN output to filter debug 2025-11-06 10:21:30 -05:00
Isaac Connor
9fbca61ad9 Bump cxxurl to 0.3.1 2025-11-05 21:46:16 -05:00
Isaac Connor
5ab0291e2e APply recommended changes re cxxurl from baddog 2025-11-05 21:42:48 -05:00
Isaac Connor
b7c4e52d99 If Server has a port specified, use it in the api url 2025-11-04 10:30:39 -05:00
Isaac Connor
4b5d7c11f0 Log wwhen defined server is not found 2025-11-04 10:26:56 -05:00
Isaac Connor
6cad229d0b Handle monitorData not existing more gracefully 2025-11-04 09:14:02 -05:00
Isaac Connor
1e75a143cd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-11-02 14:15:00 -05:00
Isaac Connor
e4ab8627f6 Merge pull request #4342 from IgorA100/patch-23613
Fix: Don't limit stream height and round parent height to integer Montage page
2025-11-02 14:05:26 -05:00
Isaac Connor
410e03b240 Merge branch 'patch-23613' of github.com:IgorA100/zoneminder 2025-11-02 14:03:10 -05:00
Isaac Connor
20b2660eeb Fix eslint 2025-10-31 15:20:21 -04:00
Isaac Connor
d0d5d68c41 Add SMPFLAGS=-j10 2025-10-31 15:17:52 -04:00
Isaac Connor
deac2ac9cf Add apt-cacher-ng proxy 2025-10-31 15:14:21 -04:00
Isaac Connor
8c6095c75b Make git dirs safe 2025-10-31 14:36:04 -04:00
Isaac Connor
fb2d646037 Remove duplicate runs-on 2025-10-31 13:31:06 -04:00
Isaac Connor
dcfa6e9c5d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-10-31 13:29:11 -04:00
Isaac Connor
5c052c2b54 Add a version for running on our Ampere server 2025-10-31 13:29:05 -04:00
Isaac Connor
02bab96eb3 Add ls -l so we can see what we are dealing with 2025-10-30 19:47:10 -04:00
Isaac Connor
e4841bde0c Remove old width/height/scale options 2025-10-30 14:16:49 -04:00
Isaac Connor
c5c61722cb Remove nav-link from flip chevron so it doesn't get the kill stream onclick handler 2025-10-30 14:16:38 -04:00
Isaac Connor
dbbe2cbcb8 Add EndDateTIme IS NULL condition when using DateTime 2025-10-30 13:53:28 -04:00
Isaac Connor
e4ee18ccf5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-10-29 17:16:33 -04:00
Isaac Connor
ee4afd9866 Include .dsc and .tar.xz in zmrepo upload 2025-10-29 17:16:26 -04:00
Isaac Connor
8ae4d4b6cf Merge pull request #4462 from IgorA100/Update_gridstack_to_version_12.3.3
Update gridstack to version 12.3.3
2025-10-29 16:19:49 -04:00
IgorA100
0812e93cd6 Removed extra files 2025-10-29 22:53:52 +03:00
IgorA100
739266bc4f Update gridstack to version 12.3.3 2025-10-29 22:46:32 +03:00
IgorA100
b0a6259fde Merge remote-tracking branch 'remotes/origin/master' 2025-10-29 22:30:05 +03:00
Isaac Connor
adc838790d Include .tar.gz in upload to zmrepo 2025-10-29 13:37:00 -04:00
Isaac Connor
4ce7a8dc7b Use DateTime instead of StartDateTime in default filters 2025-10-29 13:27:26 -04:00
Isaac Connor
ab9e4ce557 Remove commented out dead scale/resize code. Rename scrollBbarExists to scrollBarExists 2025-10-29 13:26:56 -04:00
Isaac Connor
17b7dd78f0 Make monitorStatus style only apply to non-hidden to avoid a conflict with the display property 2025-10-29 12:19:32 -04:00
Isaac Connor
736610d349 Simplify monitor state html, mostly to include the stream-info into the part that gets hidden with the other state info 2025-10-29 12:15:32 -04:00
Isaac Connor
38d82d7cc7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-10-29 10:26:51 -04:00
Isaac Connor
6413b219a6 Add ssh 2025-10-28 18:23:05 -04:00
Isaac Connor
12a094d9ee Add rsync 2025-10-28 18:16:14 -04:00
Isaac Connor
1fd561a9c8 Merge pull request #4461 from ZoneMinder/dependabot/github_actions/actions/upload-artifact-5
Bump actions/upload-artifact from 4 to 5
2025-10-28 18:14:16 -04:00
Isaac Connor
ecac8d8067 Handle failure to match regexp 2025-10-28 18:12:45 -04:00
dependabot[bot]
9a4fc26189 Bump actions/upload-artifact from 4 to 5
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-28 21:58:26 +00:00
Isaac Connor
0b97d70f6a Sanitise artifact name 2025-10-28 17:55:39 -04:00
Isaac Connor
bb1daa5345 Fixes in loading and drawing frames. 2025-10-28 17:02:41 -04:00