Commit Graph

23706 Commits (support_mariadb)

Author SHA1 Message Date
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
IgorA100 d4aaa3b30b
Update skin.js 2024-03-21 23:01:30 +03:00
IgorA100 165bd012ac
Update skin.js 2024-03-21 22:13:54 +03:00
Isaac Connor 3a19c04fcf Set background colour of fullscreen mode 2024-03-21 14:42:58 -04:00
IgorA100 237394fdeb
Fix: Elimination of jerks for slideToggle on console 2024-03-21 20:26:15 +03:00
Isaac Connor 39e2c9a5a6 Move array_diff down to where it is used 2024-03-21 12:43:01 -04:00
Isaac Connor 2e4133507a Add Network.pm 2024-03-21 10:34:54 -04:00
Isaac Connor fda44f6e3f Fixups for Manufacturer and Model routines. OutputCodec default is 0 as it is NOT NULL. Also Importance is an integer, so default should be 0. 2024-03-21 10:33:03 -04:00
Isaac Connor 586614e2bb Updates to hash_diff and parseNameEqualsValueToHash 2024-03-21 10:09:02 -04:00
Isaac Connor 789e07297d Add defaults for control fields 2024-03-21 10:00:05 -04:00
Isaac Connor c6e71b19dc Update to add new api credentials, get_config, set_config, reboot, ping and parse ip/auth from Monitor->Path 2024-03-21 09:44:03 -04:00
Isaac Connor 7e26498b80 Get ip/authentication from Monitor->Path if possibile. Add new api components credentials, reboot, ping. 2024-03-21 09:38:06 -04:00
Isaac Connor d3a7d618a9 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-20 19:19:36 -04:00
Isaac Connor 346e7141da
Merge pull request #3860 from IgorA100/patch-16
Feat: Control of collapsing/expanding blocks
2024-03-20 19:17:56 -04:00
Isaac Connor 44fc3e465c
Merge pull request #3881 from Simpler1/narrow
feat(events): Narrow mode layout (mobile portrait)
2024-03-20 19:17:29 -04:00
Isaac Connor c275f5aec3 Add debug to dput 2024-03-20 12:43:43 -04:00
Isaac Connor 2b7c607f87
Merge pull request #3878 from IgorA100/patch-30
Fix: Location of PTZ Controls buttons when scaling browser less than 100%
2024-03-20 11:53:43 -04:00
Isaac Connor c91a66ce0d
Merge pull request #3879 from borozenetsvv/master
Update ru_ru.php
2024-03-20 11:53:05 -04:00
Isaac Connor ce668c12c0 The actual min value for StartupDelay is 0 2024-03-20 11:35:37 -04:00
Isaac Connor 168f4ab3dc Rename zone=>zones. Add a case so that we don't log about an invalid tab. When doing so, log about name instead of tab. 2024-03-20 11:17:22 -04:00
Isaac Connor 62ad1f28fb Add updating server record with values as well. 2024-03-20 10:38:44 -04:00