Aaron Kling
2da562dad0
packpack: Pass platform to docker if cross-compiling
2024-03-25 15:04:20 -05:00
Isaac Connor
57e0c6a595
Merge pull request #3899 from Simpler1/patch-4
...
fix(): Accommodate commit 6f5d51c
2024-03-25 15:42:25 -04:00
Simpler1
9f2d0f46b9
fix(): Accommodate commit 6f5d51c
2024-03-25 14:55:20 -04:00
Isaac Connor
6632d04ed6
Merge pull request #3898 from webgeek1234/master
...
fixup! Actions: Build debian bookworm aarch64
2024-03-25 14:31:02 -04:00
Aaron Kling
7fbd7af829
fixup! Actions: Build debian bookworm aarch64
...
Actually pass arch to the script. Set arch on other targets just in
case.
2024-03-25 13:21:21 -05:00
Isaac Connor
b5cbaa8978
Merge pull request #3897 from webgeek1234/master
...
Actions: Build debian bookworm aarch64
2024-03-25 14:14:02 -04:00
Aaron Kling
14e78c88b6
Actions: Build debian bookworm aarch64
2024-03-25 13:12:53 -05:00
Isaac Connor
043f8f00b9
Merge pull request #3896 from IgorA100/patch-38
...
Fix: Add monitors to the filter only if the filter limit is set
2024-03-25 13:07:15 -04:00
IgorA100
2670d2e317
Added a count of the total number of available monitors.
2024-03-25 19:06:10 +03:00
IgorA100
76a412fb32
Fix: Add monitors to the filter only if the filter limit is set
...
My previous PR #3895 did not analyze the Group, Capturing, Analysing, etc. filters, but only took into account the Monitor filter
2024-03-25 18:57:59 +03:00
Isaac Connor
357650d62c
Merge pull request #3895 from IgorA100/patch-37
...
Feat: Changed monitor filter (in header table) to go from console to …
2024-03-25 08:46:04 -04:00
IgorA100
4417e24ee7
Feat: Changed monitor filter (in header table) to go from console to list of events
...
Changes are made to transition links to list of events from table header.
If no monitor is selected in console, you should not pass all monitors to filter; you must leave the monitor filter empty.
2024-03-25 13:12:21 +03:00
Isaac Connor
4755361f22
Merge pull request #3894 from IgorA100/patch-36
...
Fix: Add "All Events" in array "translate" (View event)
2024-03-24 13:12:36 -04:00
IgorA100
697f8de4f6
Fix: Add "All Events" in array "translate" (View event)
2024-03-24 19:51:24 +03:00
Isaac Connor
b2ff62fa76
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-24 11:50:05 -04:00
Isaac Connor
6f5d51c45f
Limit width of datetime inputs. They are bigger than they need to be
2024-03-24 11:50:02 -04:00
Isaac Connor
2241c88654
Fix comman translation
2024-03-24 11:49:25 -04:00
Isaac Connor
eb42ffe833
Merge pull request #3892 from IgorA100/patch-34
...
Fix: Positioning pagination block when height is less than 100% of br…
2024-03-24 10:45:21 -04:00
Isaac Connor
2d40aa9b3a
Merge pull request #3893 from IgorA100/patch-35
...
Fix: removed unnecessary parameter
2024-03-24 10:44:42 -04:00
IgorA100
f233fb39f6
Fix: removed unnecessary parameter
...
Height has already been determined:
html,
body {
height: 100%;
margin: 0;
}
2024-03-24 00:29:53 +03:00
IgorA100
cf835f8850
Fix: Positioning pagination block when height is less than 100% of browser window
2024-03-24 00:21:34 +03:00
Isaac Connor
fb9debbd9a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-23 13:38:54 -04:00
Isaac Connor
162b1a7c1d
Log an error when we don't have permission to load the preset edit modal
2024-03-23 13:38:26 -04:00
Isaac Connor
834a1114ec
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-23 11:56:01 -04:00
Isaac Connor
dd0b2bcf91
Only load preset modal if we click set. Add auth relay so that it can be loaded.
2024-03-23 11:55:53 -04:00
Isaac Connor
651ec35012
Merge pull request #3886 from IgorA100/patch-32
...
Fix: Console sticky table header
2024-03-23 11:35:03 -04:00
Isaac Connor
8e5870a919
Merge pull request #3889 from IgorA100/patch-33
...
Feat: Fixing table header when viewing log
2024-03-23 11:32:38 -04:00
Isaac Connor
b92b65a295
Merge pull request #3891 from Simpler1/patch-3
...
fix(events): Expand/Collapse for navbar-two works when narrow
2024-03-23 11:31:55 -04:00
Isaac Connor
2b8bb77040
Replace , with . in cpuloads
2024-03-23 11:31:01 -04:00
Simpler1
94a3632e1b
fix(events): Expand/Collapse for navbar-two works when narrow
2024-03-23 11:14:41 -04:00
IgorA100
7fcf01f1fa
Update log.css
2024-03-23 16:10:02 +03:00
IgorA100
a1896073f2
Feat: Fixing table header when viewing log
2024-03-23 15:50:21 +03:00
IgorA100
45d4cdaec5
Fix: tab -> space
2024-03-23 15:16:36 +03:00
Isaac Connor
1fe81e40f7
Replace commas with periods
2024-03-22 17:32:05 -04:00
IgorA100
3fcbc4741e
Update console.php
2024-03-22 23:38:30 +03:00
IgorA100
5843a8b417
Fix: Console sticky table header
...
At some point it was broken.
2024-03-22 23:34:25 +03:00
Isaac Connor
d0278d6f8b
Merge pull request #3885 from Simpler1/patch-2
...
Missed "Group" in the "narrow" commit
2024-03-22 12:27:59 -04:00
Simpler1
06ac65cc38
Missed "Group" in the "narrow" commit
...
This is just to add Group into the previous commit for narrow filter organization for the Events view.
2024-03-22 11:44:42 -04:00
Isaac Connor
6338f9b0eb
Merge pull request #3884 from Simpler1/patch-1
...
fix(): Typo
2024-03-22 10:24:19 -04:00
Simpler1
3df3e57872
fix(): Typo
2024-03-22 10:17:51 -04:00
Isaac Connor
c32f4f48fa
Add Tags and Notes filters to montagereview
2024-03-22 10:11:29 -04:00
Isaac Connor
4ae874c2f7
Use 0 instead of '' for server id if not multi-server
2024-03-22 10:02:51 -04:00
Isaac Connor
8e87fc2809
Add default values for ONVIF_EVENTS_PATH and ONVIF_Alarm_Text
2024-03-22 09:31:55 -04:00
Isaac Connor
cbaa2a5287
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-22 09:12:13 -04:00
Isaac Connor
76e2be6543
Set defaults for ONVIF_EVENTS_PATH and ONVIF_Alarm_Text
2024-03-22 09:12:07 -04:00
Isaac Connor
105da2ffc2
Merge pull request #3883 from IgorA100/patch-31
...
Fix: Elimination of jerks for slideToggle on console
2024-03-21 17:21:03 -04:00
IgorA100
c05ca0aef8
Fix space for Eslint
2024-03-21 23:41:17 +03:00
IgorA100
72dd7df15a
Space for Eslint
2024-03-21 23:30:39 +03:00
IgorA100
463f0b736e
Update console.php
2024-03-21 23:27:38 +03:00
IgorA100
bf3555fdcb
Update skin.js
2024-03-21 23:26:38 +03:00