30408df4ed
Add saving Cpuload when setting run status of server
2024-03-20 10:38:21 -04:00
ba19ad3ed6
Don't populate CpuLoad in CpuLoad() as it overwrites stored value. Need to add in proper object support Fixes load being 0
2024-03-20 10:37:55 -04:00
ef5e90d669
Improve logic of DiskSpace pre condition. Implement specific op support, instead of using unsafe eval.
2024-03-20 10:22:15 -04:00
8b94b0774f
feat(events): Narrow mode layout (mobile portrait)
2024-03-20 10:09:01 -04:00
6ee529cca5
Fully specify logging functions as we don't actually import them into our namespace
2024-03-20 09:55:34 -04:00
31295744d2
fix space
2024-03-20 11:44:25 +03:00
7042260bbf
Clean code
2024-03-20 11:41:52 +03:00
712cfe5cb8
Control buttons have absolute position
...
This is more correct and beautiful and will not depend on the browser scale
2024-03-20 11:27:53 +03:00
999e5df148
Update ru_ru.php
2024-03-20 12:23:12 +07:00
d41271054a
Fix: Location of PTZ Controls buttons when scaling browser less than 100%
...
Possible fix #3877
2024-03-19 23:12:45 +03:00
51211ce271
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-19 14:59:19 -04:00
1ae7c9c4b1
Add UI for setting StartupDelay
2024-03-19 14:59:04 -04:00
a184f3adeb
Always restart the analysis thread. It is needed. Also free convert_context in Pause
2024-03-19 14:55:21 -04:00
8b5fdf0b71
Merge pull request #3876 from IgorA100/patch-29
...
Fix: Russian translation
2024-03-19 08:55:37 -04:00
58c1e036c6
Fix: Russian translation
...
Based on #3875
2024-03-19 12:25:24 +03:00
4b58358761
Merge branch 'ZoneMinder:master' into patch-16
2024-03-19 10:29:27 +03:00
075155b6ff
Merge branch 'add_startup_delay' of github.com:ZoneMinder/zoneminder into add_startup_delay
2024-03-18 22:15:44 -04:00
20eeb8739d
Merge pull request #3869 from IgorA100/patch-24
...
Add vertical table scroll on Options page
2024-03-18 21:17:19 -04:00
9fe90baea2
Merge pull request #3872 from borozenetsvv/master
...
Update ru_ru.php
2024-03-18 21:15:21 -04:00
c3f5d9c550
Merge pull request #3874 from IgorA100/patch-28
...
Fix: Display according to translation
2024-03-18 21:14:42 -04:00
8cb4f39593
Merge pull request #3873 from IgorA100/patch-27
...
Fix: Tracking the "shift" button press on live view page
2024-03-18 13:00:14 -04:00
1d7efa7088
Add StartupDelay to Monitors
2024-03-18 12:55:19 -04:00
ebcc2cd045
Bump version to 1.37.56 for StartupDelay in Monitors
2024-03-18 12:55:03 -04:00
92e6a9b5d0
Rough in startup_delay function
2024-03-18 12:54:30 -04:00
40a249ef56
fix space
2024-03-18 18:54:43 +03:00
f20ce4627d
Fix: Display according to translation
2024-03-18 18:51:40 +03:00
60cd909bf3
Fix: Tracking the "shift" button press
2024-03-18 18:04:03 +03:00
3a1872633a
Update ru_ru.php
2024-03-18 19:25:15 +07:00
ee27974bd2
Merge branch 'ZoneMinder:master' into patch-16
2024-03-18 00:36:46 +03:00
1dbfd36038
Merge pull request #3870 from IgorA100/patch-25
...
Added a button for editing detection zone from monitor settings
2024-03-16 19:06:27 -04:00
a42cf7a5c5
Replaced quotes
2024-03-16 15:32:43 +03:00
1b7f3b0ede
Added a button for editing detection zone from monitor settings
2024-03-16 15:23:16 +03:00
ecd0c644c7
Merge branch 'ZoneMinder:master' into patch-24
2024-03-15 23:23:45 +03:00
9dc93389f9
Merge branch 'ZoneMinder:master' into patch-16
2024-03-15 23:22:03 +03:00
9eb3565483
Set reorder_queue size to 2*keyframe interval as 1* does not seem to be enough.
2024-03-15 12:11:22 -04:00
1bd94308b1
Make no alarm.jpg a debug instead of error, because continuous events don't have them.
2024-03-15 12:09:31 -04:00
1c782529c4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-15 11:42:32 -04:00
8442a1aca4
fixup reversion of bootstrap-table console which shouldn't have been merged yet
2024-03-15 11:42:07 -04:00
cc6acfe3ed
Merge pull request #3868 from IgorA100/patch-23
...
Fix Horizontal scroll bar in live view
2024-03-15 11:41:25 -04:00
a199a4cb8d
Fix button bar as a result of reverting bootstrap-table console
2024-03-15 11:40:20 -04:00
e7795513f5
Moved the <form> block for the "Options-Storage" page to a separate file "_options_storage.php"
2024-03-15 18:15:56 +03:00
320041ed4d
Page "Options-Storage" The buttons are now at the top. Added DIV with .wrapper-scroll-table
...
- The <form> is placed in a separate file for ease of use.
- Necessary for organizing vertical scrolling of a block with a table
2024-03-15 18:12:00 +03:00
8f5e1e3e1a
Page "Options-Servers" The buttons are now at the top. Added DIV with .wrapper-scroll-table
...
Necessary for organizing vertical scrolling of a block with a table
2024-03-15 18:07:50 +03:00
4eb853c90f
Page "Options-Users" The buttons are now at the top. Added DIV with .wrapper-scroll-table
...
Necessary for organizing vertical scrolling of a block with a table
2024-03-15 18:05:11 +03:00
de5d069b5e
Page "Groups" The buttons are now at the top. Added #optionsContainer & #options and DIV with .wrapper-scroll-table
...
Necessary for organizing vertical scrolling of a block with a table
2024-03-15 17:59:11 +03:00
3953ad982f
Added styles for vertical scrolling of the table container
2024-03-15 17:53:36 +03:00
ed9c91c9f3
Revert "Revert "Merge pull request #3864 from IgorA100/patch-19""
...
This reverts commit 00bd09fdc2
2024-03-15 10:53:30 -04:00
95d4458965
Add wrapper fo scroll table & remove padding-top from "form" & add padding to #optionsContainer
...
When sticky mode is enabled, the table must be scrolled vertically if it does not fit on the page.
It may not be the best option, but now it is necessary. For example, for the pages "Servers, Storage, Groups", etc.
Changing the padding-top is necessary to maintain a single style if there are some other elements in front of the form (buttons for example) or there is nothing in front of the form.
2024-03-15 16:26:49 +03:00
00bd09fdc2
Revert "Merge pull request #3864 from IgorA100/patch-19"
...
This reverts commit 305a1485cc736ac7dd33
2024-03-15 09:13:22 -04:00
da3749389a
Fix Horizontal scroll bar in live view
...
When scaling videos larger than the screen size, the horizontal bar was not visible.
2024-03-15 13:00:57 +03:00
Isaac Connor
Simpler1
IgorA100
borozenetsvv
Isaac Connor