Commit Graph

10331 Commits (support_mariadb)

Author SHA1 Message Date
Isaac Connor c8d9cd02d7 Fix use of int as a function instead of a cast 2024-03-28 09:02:53 -04: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
IgorA100 790c69b20a
Fix: Warning if not specify term in FilterTerm
Required Term
2024-03-27 01:14:20 +03: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
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
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 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
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 66fa612d02 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-25 09:53:33 -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
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 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
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
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
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
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 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