Isaac Connor
b7baab3394
Merge pull request #3915 from Simpler1/patch-6
...
chore(lint): $ locations
2024-03-28 10:17:12 -04:00
Isaac Connor
f624ad08f2
Merge pull request #3913 from Simpler1/patch-5
...
feat(): Term layout
2024-03-28 10:11:43 -04:00
Simpler1
992b729329
chore(lint): $ locations
2024-03-28 09:59:58 -04:00
Simpler1
9716cabe92
feat(): Term layout
2024-03-28 09:41:34 -04:00
Isaac Connor
99117a37f1
Merge pull request #3908 from IgorA100/patch-41
...
Feat: Change scrollbar style for dark css
2024-03-28 09:41:20 -04:00
Isaac Connor
c8d9cd02d7
Fix use of int as a function instead of a cast
2024-03-28 09:02:53 -04:00
IgorA100
e9a53ce0b7
Add scrollbar change for WEB_NAVBAR_STICKY disabled mode
2024-03-28 01:16:43 +03:00
IgorA100
261d629ee5
Add change style scrollbar for ".chosen-results"
2024-03-28 00:46:20 +03:00
Isaac Connor
97af155102
Remove extra }. Fixes #3911
2024-03-27 17:36:45 -04:00
Isaac Connor
9b1ea23792
When deleting a monitor, stop running zmc and zmcontrol processes
2024-03-27 13:03:54 -04:00
Isaac Connor
21183d332b
Handle when auth is off, _getCredentials returns null so accessing it as an array is bad.
2024-03-27 12:57:12 -04:00
Isaac Connor
dc37a57dbc
Remove debug.
2024-03-26 18:41:32 -04:00
Isaac Connor
4919f4feef
Merge pull request #3909 from IgorA100/patch-42
...
Fix: Warning if not specify term in FilterTerm
2024-03-26 18:21:47 -04:00
IgorA100
790c69b20a
Fix: Warning if not specify term in FilterTerm
...
Required Term
2024-03-27 01:14:20 +03:00
IgorA100
8b41b37bef
Feat: Change scrollbar style for dark css
2024-03-26 23:41:20 +03:00
Isaac Connor
f28fe82fcf
Merge pull request #3907 from webgeek1234/master
...
Format code using astyle google format
2024-03-26 14:50:58 -04:00
Aaron Kling
c4683d90a9
Format code using astyle google format
...
Commands used:
astyle --style=google --indent=spaces=2 --keep-one-line-blocks src/*.cpp
astyle --style=google --indent=spaces=2 --keep-one-line-blocks src/*.h
2024-03-26 13:43:58 -05:00
Isaac Connor
ed8ad15161
Merge pull request #3902 from IgorA100/patch-39
...
Fix: css, remove important, add fix style .chosen-choices
2024-03-26 11:53:11 -04:00
IgorA100
ba776478e6
Fix: Text color in the Input field
2024-03-26 17:32:23 +03:00
Isaac Connor
5f86a8a28c
Merge pull request #3905 from IgorA100/patch-40
...
Fix: Russian translation
2024-03-26 08:54:21 -04:00
IgorA100
0f5abeb190
Fix: Russian translation
...
Based on #3888
2024-03-26 14:51:48 +03:00
Isaac Connor
915c3db91d
Place an arbitrary lower limit on scale value. Have seen scale=1 so I think 10 might be a reasonable value to limit to. Need to figure out how we got to a value of 1.
2024-03-25 19:03:01 -04:00
Isaac Connor
09838ea605
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-25 19:00:43 -04:00
Isaac Connor
1fae14d202
Merge pull request #3904 from webgeek1234/master
...
fixup! Actions: Enable aarch64 on all debian based targets
2024-03-25 18:27:39 -04:00
Aaron Kling
a7bfa3db0b
fixup! Actions: Enable aarch64 on all debian based targets
...
Actions doesn't like arrays of archs in this context
2024-03-25 17:09:16 -05:00
Isaac Connor
c008f60ed9
Merge pull request #3903 from webgeek1234/master
...
Actions: Enable aarch64 on all debian based targets
2024-03-25 18:01:07 -04:00
Aaron Kling
f0025d6bf8
Actions: Enable aarch64 on all debian based targets
2024-03-25 16:43:18 -05:00
IgorA100
59500a20f0
Fix: CSS. Added .chosen-container & border of table rows and input, button
2024-03-26 00:32:32 +03:00
IgorA100
16af156365
Important no longer needs to be used. Fix style .chosen-choices
2024-03-26 00:21:57 +03:00
Isaac Connor
15d259d361
Merge pull request #3901 from webgeek1234/master
...
Actions: Set up qemu static when building arm64
2024-03-25 16:41:11 -04:00
Aaron Kling
4ed763a160
Actions: Set up qemu static when building arm64
2024-03-25 15:29:00 -05:00
Isaac Connor
e1e4d85439
Merge pull request #3900 from webgeek1234/master
...
packpack: Pass platform to docker if cross-compiling
2024-03-25 16:10:04 -04:00
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
83cd5200b0
Free user if token is expired.
2024-03-25 09:56:10 -04:00
Isaac Connor
66fa612d02
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-25 09:53:33 -04: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
7f74de5d91
Fix map display
2024-03-24 13:19:53 -04: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
