01cda74b96
Add bootstrap-table-mobile extension so event list becomes cards
2024-08-16 18:48:34 -04:00
52584c0d54
Add Location to events list. Rename variables for buttons. Make DiskSpace and Storage clickable so that on mobile you don't have to scroll back left
2024-08-16 10:53:13 -04:00
09f5e6df7d
Add an id to montage review button
2024-08-15 15:13:14 -04:00
70fe9e1609
Fix missing filterbar
2024-08-14 13:30:55 -04:00
7aa473b8ef
Handle more than one level of output buffering when cleaning and ending them so we can send the video file so we don't run out of ram. Fixes #4110
2024-08-11 09:16:36 -04:00
ed23445d61
Merge branch 'ZoneMinder:master' into patch-160
2024-08-04 23:24:37 +03:00
235e788aba
Make toolbar take up 100% or close to it
2024-08-01 09:59:32 -04:00
346e04a1c0
Add container-fluid to toolbar because the row has negative margins because it expects to be in a container
2024-08-01 09:59:14 -04:00
c42608f1ba
Very slight performance optimisation. Delete the auth keys from the object so we don't have to check for them to ignore later
2024-07-30 09:55:16 -04:00
37e7da4dfa
Don't keep our own copy of auth credentials. Use the global ones. When getting new auth from status request, update auth_relay as well.
2024-07-30 09:54:37 -04:00
b613d562bf
Only show CaptureMethod if there is more than 1 option
2024-07-25 12:37:45 -04:00
d1e8975e41
FIx WallClockTimeStamps not being hidden when not passthrough
2024-07-25 12:37:31 -04:00
31197c1039
Add convenience dropdown for video devices
2024-07-25 12:08:38 -04:00
8767bd326a
Update ru_ru.php
2024-07-20 13:49:18 +03:00
b8ca4f2369
Update skin.js
2024-07-19 14:11:28 +03:00
0f3a61efe5
eslint
2024-07-18 17:05:02 -04:00
d50983016b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-07-18 16:05:41 -04:00
32fcfa4559
Add default for EmailServer in Filter
2024-07-18 16:05:34 -04:00
1a78c609dc
Chore: Code optimization (skin.js)
...
You should not call "console.log" again, because if you put a comma, the object will be displayed on a new console line.
2024-07-17 11:57:37 +03:00
a700ad1619
Recovering the Lost $colAllAvailableMonitors Variable (_monitor_filters.php)
2024-07-16 20:06:08 +03:00
a9c5289957
Recovering the Lost $colAllAvailableMonitors Variable (console.php)
2024-07-16 20:02:47 +03:00
644b923c87
Update ru_ru.php
2024-07-16 18:57:58 +03:00
0f4e837842
Update ru_ru.php
2024-07-16 18:33:45 +03:00
262d0469b2
Added 'EventsLoading' (en_gb.php)
2024-07-16 18:19:12 +03:00
08dcdb54b4
Added "TooManyEventsForTimeline" (en_gb.php)
2024-07-16 18:14:32 +03:00
8e07e016a1
Update ru_ru.php
2024-07-16 18:09:32 +03:00
d8fbce378a
Update ru_ru.php
2024-07-16 18:06:01 +03:00
c6d8267420
Update ru_ru.php
2024-07-16 17:42:44 +03:00
0e1c61dbb6
Merge pull request #4093 from IgorA100/patch-157
...
Feat: Show filter "Archive Status" on Events page
2024-07-16 10:22:37 -04:00
8c6396a659
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-07-16 10:01:19 -04:00
4b52232228
Add Unarchived and Archive and Unarchive translated strings
2024-07-16 10:00:55 -04:00
8291f657eb
Only log error message from ajax events data call if it is other than abort. Add useful title to unarchive button explaining why it is disabled.
2024-07-16 10:00:34 -04:00
119e7230c1
Update events.js
2024-07-16 16:46:24 +03:00
e9f4f113d9
Changed Id from Archived to filterArchived (events.js)
2024-07-16 16:29:06 +03:00
93e03952f7
Added identifiers "filterArchived", "filterTags", "filterNotes" (Filter.php)
...
This is necessary for working with cookies, and will also be used on the updated Montage page
2024-07-16 16:26:54 +03:00
5957ef0cf0
zmFilterArchived cookie support (events.js)
2024-07-16 16:17:29 +03:00
89774f9921
Show filter "Archive Status" on Events page (events.php)
...
Currently, if there is no "Archive Status" filter in the browser query string, then it is not displayed on the page.
Now the "Archive Status" filter will always be displayed.
2024-07-16 16:14:41 +03:00
5cc545e182
Recovering the Lost $StorageById Variable (console.php)
2024-07-16 12:56:51 +03:00
0a59a8cb1c
Recovering the Lost $StorageById Variable (_monitor_filters.php)
2024-07-16 12:27:54 +03:00
d36888d36e
Recovering the lost $selected_monitor_ids variable (report_event_audit.php)
2024-07-16 11:15:12 +03:00
2ffa6cb96e
Recovering the lost $selected_monitor_ids variable (montagereview.php)
2024-07-16 11:10:48 +03:00
006010a971
Recovering the lost $selected_monitor_ids variable (_monitor_filters.php)
2024-07-16 11:09:39 +03:00
d2129a9b43
Recovering the Lost $storage_areas Variable (console.php)
2024-07-16 10:59:09 +03:00
e75be00942
Recovering the Lost $storage_areas Variable ( _monitor_filters.php)
2024-07-16 10:57:35 +03:00
3403c82b73
Use function buildMonitorsFilters instead of using ob_get_contents (report_event_audit.php)
2024-07-16 00:48:30 +03:00
326d5e3084
Use function buildMonitorsFilters instead of using ob_get_contents (montagereview.php)
2024-07-16 00:47:05 +03:00
c6056ada7d
Use function buildMonitorsFilters instead of using ob_get_contents (console.php)
2024-07-16 00:45:34 +03:00
fd98fc97bd
Use function buildMonitorsFilters instead of using ob_get_contents (montage.php)
2024-07-16 00:43:25 +03:00
d44e6ab807
Use function buildMonitorsFilters instead of using ob_get_contents (cycle.php)
2024-07-16 00:41:25 +03:00
a9658fc891
Use function buildMonitorsFilters instead of using ob_get_contents (watch.php)
2024-07-16 00:38:02 +03:00
948bc92db5
Moved part of the code to function buildMonitorsFilters. Don't use ob_get_contents (_monitor_filters.php)
2024-07-16 00:21:34 +03:00
0160a92854
Fix: setCookie(). For Boolean type should not be used JSON (skin.js)
2024-07-15 13:03:54 +03:00
1990c52961
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-07-14 15:33:34 -04:00
3d11c114ac
Chore: remove extra space (monitor.js)
2024-07-14 16:48:57 +03:00
e0f7340d7d
Added thumbnail video animation (monitor.js)
2024-07-14 16:46:11 +03:00
3591c8717c
Feat: Show the camera image on the monitor editing page on the Viewing tab (monitor.php)
2024-07-14 16:41:48 +03:00
a24fbe4574
Add EmailServer to filter to override server set in options
2024-07-10 17:14:36 -04:00
caeb65233e
Fix not being able to unset use WallClockTimestamps
2024-07-08 08:36:55 -04:00
007b8bebbf
Limit viewable filesystem to defined storage areas
2024-07-06 17:52:43 -04:00
716a7bae61
Only show WallClockTimestamps option for passthrough
2024-07-06 08:53:15 -04:00
200ba2322f
Add WallClockTimestampts to monitor edit under recording options
2024-07-06 08:51:58 -04:00
a3c73b414f
Add WallCLockTimestamps to Monitor model
2024-07-06 08:51:37 -04:00
474abe6ed6
Fix test for whether ptz button is disabled
2024-07-05 09:46:34 -04:00
c369826fbf
Always show ptz button, just disbabled with useful tooltip
2024-07-05 09:34:52 -04:00
55d80d50d7
Use monitors instead of monitorData as the array to traverse. Somehow we end up with there not being an entry in monitors when there is one in monitorData. Maybe when visibility events occur during InitPage? Anyways, if we are actually traversing monitors, then we should do so in the for loop.
2024-07-04 10:44:00 -04:00
87d31a1d77
Updated comment (skin.js)
2024-07-04 17:03:53 +03:00
837b17cc4e
Chore: eslint (skin.js)
2024-07-04 16:45:23 +03:00
415e5e9f0a
Code optimization (skin.js)
2024-07-04 16:40:17 +03:00
afeddf57f5
Added the ability to save objects and arrays in cookies using JSON (skin.js)
2024-07-04 16:35:22 +03:00
efbe6ab219
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-07-03 08:42:41 -04:00
43e21a3200
Update auth_hash in zms url
2024-06-28 14:33:59 -04:00
47eff20c1d
Fix misplaced </div> for Groups Permissions
2024-06-28 11:50:51 -04:00
2525ef7641
Update charset header in ja_jp.php from Shift_JIS to UTF-8
...
Given that most Japanese servers now use UTF-8, it makes sense to set UTF-8 as the default charset.
2024-06-28 18:09:55 +09:00
65da80d6ae
remove extra space
2024-06-21 15:49:53 -04:00
eea0e8fe64
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2024-06-20 20:58:33 -04:00
d8e15f19c2
Add options for h264_v4l2m2m encoder
2024-06-20 20:58:21 -04:00
420aa9a525
fix eslint
2024-06-19 09:39:01 -04:00
48dc523eee
Merge pull request #4068 from IgorA100/patch-141
...
Changed the flip panel control "data-flip-control-object" (skin.js)
2024-06-19 09:21:53 -04:00
ba833006ef
Merge pull request #4082 from IgorA100/patch-151
...
Fix: If "opts.focal" - calculate coordinates taking into account the planned Scale, and not just the calculated Scale (jquery.panzoom.js)
2024-06-19 09:21:02 -04:00
9a87e2976f
Fix js error when clicking play/pause when using video.js as viewer
2024-06-17 14:51:02 -04:00
54d363bf85
Fix: If "opts.focal" - calculate coordinates taking into account the planned Scale, and not just the calculated Scale (jquery.panzoom.js)
...
I created a PR in the author's repository, but there is no feedback yet.
https://github.com/timmywil/panzoom/pull/669
2024-06-17 11:16:11 +03:00
ae36a1f502
More compact display of Frame information (event.js.php)
2024-06-15 23:47:29 +03:00
1e34f5aee6
More compact display of Frame information (event.js)
2024-06-15 23:44:53 +03:00
081c3900a1
Merge pull request #4079 from IgorA100/patch-149
...
TotScore, AvgScore, MaxScore display in one line Event page
2024-06-15 14:15:26 -04:00
a5aef97464
Floor the scaling value % 5
2024-06-15 13:34:02 -04:00
ecc947a71d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-15 13:30:12 -04:00
b36d67c002
Set a cookie for speed value so that it persists over reloads
2024-06-15 13:30:04 -04:00
12b84255ee
From "eventDataStrings" instead of "MaxScore" process "Score" (event.js)
2024-06-15 00:50:37 +03:00
04c743d888
Merge pull request #4072 from IgorA100/patch-144
...
Added the ability to initialize with parameters (PanZoom)
2024-06-14 17:46:26 -04:00
0587cdc7a9
Update event.js.php
2024-06-15 00:41:21 +03:00
c57af2c8ca
Fix: Added getStat execution error handling (frame.js)
2024-06-15 00:28:53 +03:00
b1a35c339e
Chore: Fix extra space & lost semicolon (skin.js)
2024-06-14 19:35:45 +03:00
730c3b5161
Changing the icon control for the hide/show panel button (skin.js)
...
+ Part of the code for controlling the icon of the button to hide/show the panel has been moved to the "changeButtonIcon" function
+ Added support for the "data-initial-state-icon" attribute to make it possible not to use cookies when initially opening a page.
2024-06-14 19:29:17 +03:00
576dc6a652
Merge branch 'ZoneMinder:master' into patch-141
2024-06-14 19:23:35 +03:00
038b3b2886
Chore: eslint (watch.js)
2024-06-14 15:49:13 +03:00
d9b9dfc77f
Chore: eslint (panzoom.js)
2024-06-14 15:47:02 +03:00
5c3f244a9a
Added initialization of the experimental PanZoom function for reducing a block containing an image (Shift+Alt+mouse wheel) (watch.js)
2024-06-14 15:39:42 +03:00
7fadd6444b
Merge branch 'ZoneMinder:master' into patch-144
2024-06-14 15:33:40 +03:00
845049c951
When initializing, specify any PanZoom & more parameters (panzoom.js)
...
+ During initialization, you can specify any parameters that will later be transferred directly to "Panzoom"
+ Added an experimental function for reducing the block containing the image (Shift+Alt+mouse wheel).
To do this, you need to initialize another object. For example like this:
"zmPanZoom.init({objString: '.imageFeed', disablePan: true, contain: 'inside', additional: true});"
The key parameter for additional control (Alt key) is "additional: true"
+ Code optimization
2024-06-14 15:31:19 +03:00
cb3b29dd8b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-13 09:28:38 -04:00
b0081d93d6
Make code a little more robust when expected attributes are not found. Mitigates #4076
2024-06-13 09:28:25 -04:00
fe9cc6d2a7
Don't change skin.js now, it will cause problems in other places
...
Additional research is required in a quiet environment.
2024-06-12 00:14:44 +03:00
a4443bb0a7
Update watch.js
2024-06-11 23:17:01 +03:00
073bbfc316
dataOnClick is called with a delay, because DOM change occurs (watch.js)
2024-06-11 23:06:59 +03:00
02a66983a5
Merge branch 'master' into patch-147
2024-06-11 22:58:32 +03:00
6308ceaf0c
Update watch.js
2024-06-11 22:48:02 +03:00
e874fd9c1f
Chore: code optimization (watch.js)
2024-06-11 22:33:20 +03:00
5e3bfbb392
Call dataOnClick() when switching to new next camera (watch.js)
...
Necessary because we change the DOM
2024-06-11 21:54:01 +03:00
add8eb4be3
Temporarily added dataOnClick() when initializing the page (watch.js)
2024-06-11 21:18:47 +03:00
6bf2c2653f
Merge pull request #4074 from IgorA100/patch-146
...
currentMonitor variable is now global for the Watch page
2024-06-11 14:03:02 -04:00
e85078ca2d
Handle when ptzToggle does not exist because OPT_CONTROL is off
2024-06-11 14:00:01 -04:00
8fe2da13fb
Fix use of validFloat which doesn't exist
2024-06-11 13:59:46 -04:00
f40cf5866e
Fix: addEventListener used after page load (skin.js)
...
This will be more correct!
This solves the problem https://forums.zoneminder.com/viewtopic.php?p=134573#p134573
I hope no other problems arise in connection with the code transfer.
2024-06-11 20:31:36 +03:00
abc72ff7dc
Fix: Include the file "includes/control_functions.php" only once (watch.php)
2024-06-11 19:50:32 +03:00
25b6fa8488
Fix: Limit scope for "handleClick" (watch.js)
2024-06-11 19:21:20 +03:00
68cbfe0160
currentMonitor variable is now global for the Watch page (watch.js)
2024-06-11 11:43:58 +03:00
ddb82112ee
Fix: Unified style for Buttons=disabled (light theme skin.css)
2024-06-10 11:52:14 +03:00
2c583a386e
Fix: Unified style for Buttons=disabled (dark theme skin.css)
2024-06-10 11:45:44 +03:00
2734827d21
validHtmlStr isn't strong enought o prevent injection. Use validFloat on maxfps.
2024-06-09 10:26:52 -04:00
e5367621cf
Use disabled instead of hiding/unhiding the ptz toggle. Fix passing monitorStream instead of currentMonitor to applyMonitorControllable
2024-06-09 10:26:18 -04:00
538cfacac9
Merge pull request #4062 from IgorA100/patch-135
...
When viewing in a cycle, move to the next stream without reloading Watch page
2024-06-07 15:54:13 -04:00
da8882b67f
Chore: Code optimization (watch.js)
2024-06-07 22:08:25 +03:00
cbf3812a30
After pressing Play, do not reset the time countdown if pause was enabled before (watch.js)
2024-06-07 21:56:02 +03:00
05e9363251
Pressing any DVR control button will stop cycle. (watch.js)
2024-06-07 21:46:39 +03:00
44823b2c65
Start playback at the beginning of the time segment, not the middle
2024-06-07 12:42:51 -04:00
d29a60a6b3
Merge pull request #4065 from IgorA100/patch-138
...
Fix: in function "scaleToFit" do not take padding into account if the width is enough (skin.js)
2024-06-07 11:57:41 -04:00
f4d69d3ebb
Merge pull request #4071 from IgorA100/patch-143
...
Added position definition and background color for ".monitorStatus" (CSS)
2024-06-07 11:56:55 -04:00
991489a391
Use const instead of var for some variables
2024-06-06 18:11:22 -04:00
22f3910953
Use statusRefreshTimeout instead of delay on status requests. If new auth info is found in statusresponse, use it.
2024-06-06 18:10:53 -04:00
51ad77c6b9
Always add auth_relay info to status requests
2024-06-06 18:10:23 -04:00
ad6a8c376b
Add new auth_hash to any status request. Fixed auth timeout when using rtsp2web or janus
2024-06-06 17:51:05 -04:00
e0bfc12a66
Now addEventListener without an anonymous function (panzoom.js)
...
+ Now addEventListener without an anonymous function, which allows you to correctly removeEventListener for a specific PanZoom object
+ Disabling ".btn-zoom-in" and ".btn-zoom-out" only for the PanZoom object being disabled, not for all.
2024-06-07 00:13:01 +03:00
ba62d251cd
Chore: eslint (panzoom.js)
2024-06-06 20:16:19 +03:00
79073cab23
Added all other event handlers (panzoom.js)
2024-06-06 20:01:35 +03:00
d377d2f5dc
Добавил возможность инициализации с параметрами (panzoom.js)
...
+ Изменять стиль курсора в зависимости от disablePan & disableZoom
+ Добавлена обработка ошибочных ситуаций.
+ Добавлено назначение функций для прослушивания событий "panzoomchange", "panzoomzoom"
2024-06-06 19:54:56 +03:00
95c4b01791
Added background color definition for ".monitorStatus" Dark theme (skin.css)
2024-06-06 18:34:32 +03:00
b927c5d0b2
Added position definition and background color for ".monitorStatus" (skin.css)
2024-06-06 18:31:39 +03:00
08fd4c0a82
Code Cleanup (skin.js)
2024-06-06 18:10:07 +03:00
82e4433ec1
Changed the flip panel control "data-flip-control-object" (skin.js)
...
Do not "slideToggle" for a button that has the 'data-on-click-true' attribute.
This means that control occurs in the function specified in the 'data-on-click-true' attribute.
2024-06-05 23:59:49 +03:00
c3d4328adb
Fix: Avoid error if object was not initialized & more (panzoom.js)
...
- Do nothing if you click on the image without Ctrl or Shift
2024-06-05 21:12:14 +03:00
39e9697873
Do not change the "stopBtn" button when analyzing "monitorStream.status.delayed" (watch.js)
...
Otherwise, the "stopBtn" button will not be active when viewing.
I still don’t understand why this was necessary?
2024-06-05 20:55:35 +03:00
68145fb358
Generating a new URL for the "All events" button (watch.php)
2024-06-05 20:44:10 +03:00
41403d5a9c
Generating a new URL for the "All events" button (watch.js.php)
2024-06-05 20:42:35 +03:00
9bc1c10f63
Generating a new URL for the "All events" button (watch.js)
2024-06-05 20:41:27 +03:00
d2e97d2324
Updated address bar URL when switching to next monitor (watch.js)
2024-06-05 18:40:19 +03:00
770b3c4054
Fix: The "filterQuery" variable needs to be changed when moving to the next monitor. (watch.js)
2024-06-05 17:52:15 +03:00
68c7f16d63
Lost line "var element = document.getElementById(element_id);" (watch.js)
2024-06-05 17:09:56 +03:00
14604520bc
Merge branch 'ZoneMinder:master' into patch-135
2024-06-05 17:07:51 +03:00
53d057d7aa
After the monitor name, display its ID (Monitor.php)
2024-06-05 15:21:09 +03:00
4a03065c7e
Fix: eslint (watch.js)
2024-06-05 14:49:28 +03:00
160715bd5d
Fix: Вместо innerWidth()-padding skin.js
2024-06-05 14:38:49 +03:00
2dcb3a3c2f
Display a single style of DVR control buttons (watch.php)
...
Button visibility/activity will be controlled by watch.js
2024-06-05 14:04:57 +03:00
ec824469fb
Fix: Image size with Scale=Auto and others (watch.js)
...
- Code cleaning with removal of unused code.
- Added a temporary function "setButtonStateWatch"
- Added a Stop button
- Partially redesigned the logic for displaying DVR control buttons (Play, Stop, Pause)
2024-06-05 14:00:44 +03:00
a43fd0504e
Fix: in function "scaleToFit" do not take padding into account if the width is enough (skin.js)
2024-06-04 21:33:11 +03:00
8a496f5d17
Remove extra comma that now breaks php
2024-06-04 09:39:22 -04:00
2841427552
Chore: eslint (watch.js)
2024-06-04 15:39:57 +03:00
a1b3e454d0
.hidden, .hidden-shift, .invisible should be at the end of the file (skin.css)
2024-06-04 15:28:54 +03:00
92903c6a10
Added more values to "monitorData" (watch.js.php)
2024-06-04 15:26:14 +03:00
ba5cb4adcd
Added $this->streamSrc = $streamSrc (Monitor.php)
...
Required to switch without reloading the page between monitors on the Watch page
2024-06-04 15:22:59 +03:00
d6b7daf5db
Added function "loadFontFaceObserver()" skin.js
...
Because the function code must also be called from other JS, for example watch.js
2024-06-04 15:15:28 +03:00
da8ca3f297
Update watch.php
2024-06-04 15:08:36 +03:00
408a7ac5ca
Update watch.js
2024-06-04 14:51:01 +03:00
342a73872b
Merge branch 'ZoneMinder:master' into patch-135
2024-06-04 14:28:26 +03:00
95feb4d127
FIx missing {
2024-06-03 12:48:14 -04:00
a5a015d502
Fix TimerHideShow not being defined.
2024-06-03 09:14:54 -04:00
6e9c69300b
Handle no rows return from Server_Stats
2024-06-02 16:04:15 -04:00
3c389e7f7f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-02 12:51:52 -04:00
e7eba3d33c
Merge pull request #4058 from IgorA100/patch-132
...
Added Scales = Max 480, 640, 800, 1024, 1280, 1600 px & added settings Stream Quality on Watch, Event & Montage page
2024-06-02 12:39:58 -04:00
5cfa4465de
Merge pull request #4063 from IgorA100/patch-136
...
Fix: For bind/unbind events use namespaced (PanZoom)
2024-06-02 12:39:10 -04:00
eb1a38c74c
Changed attr "title" for "#monitor" (Monitor.php)
...
Made in two lines and added capital letters.
2024-06-02 00:07:37 +03:00
4f9657c482
Fix: eslint (panzoom.js)
2024-06-01 23:37:37 +03:00
71a08c94dd
Fix: For bind/unbind events use namespaced (panzoom.js)
...
- When disable, also perform unbind keyup, keydown
- Code optimization.
2024-06-01 23:32:53 +03:00
bf18a685da
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-31 14:53:50 -04:00
414b28d42a
Update style of variable embeddeding in string. php complains now
2024-05-31 14:53:45 -04:00
6f7728bf1e
Update watch.js
2024-05-31 20:11:43 +03:00
6ee8c91fc1
<ul.nav nav-pills> for <li> assign ID (watch.php)
2024-05-31 20:05:05 +03:00
45dab6dc48
Update watch.js
2024-05-31 19:25:40 +03:00
4c6059fb23
Hide image when page starts opening (watch.php)
2024-05-31 19:22:00 +03:00
4b5d468af3
Delay monitors stopping for 15 seconds when hiding page (zones.js)
2024-05-31 17:55:42 +03:00
f9a55201cd
Delay monitors stopping for 15 seconds when hiding page (zone.js)
2024-05-31 17:53:18 +03:00
1d5f049df2
Delay monitors stopping for 15 seconds when hiding page (watch.js)
2024-05-31 17:42:12 +03:00
2123a565e2
Delay monitors stopping for 15 seconds when hiding page (montage.js)
2024-05-31 17:27:10 +03:00
e5e7cb470f
Added $streamQuality processing (montage.php)
2024-05-31 15:36:23 +03:00
35ea667378
Added $streamQuality processing (montage.js)
2024-05-31 15:35:15 +03:00
802ffe12ce
Merge branch 'ZoneMinder:master' into patch-132
2024-05-31 15:31:29 +03:00
5565b8cca1
Fix: variable declaration (event.js)
2024-05-31 14:53:55 +03:00
d5a8d931e6
Chore: eslint (watch.js)
2024-05-31 14:07:53 +03:00
c6c916d9ef
Chore: eslint event.js
2024-05-31 14:01:07 +03:00
ac85492f1b
$streamQuality applied to portrait mode (event.js)
2024-05-31 13:59:14 +03:00
fc127b7c47
$streamQuality applied to portrait mode (watch.js)
2024-05-31 13:55:59 +03:00
1751789fb9
Rename 'Max width 480px' to 'Max 480px' Etc. (config.php)
...
Because the image can be in either a landscape or a portrait, which means you need to control both the width and height
2024-05-31 13:32:35 +03:00
ee9206eff6
Added $streamQuality processing (event.php)
2024-05-31 01:18:54 +03:00
fb866a1edc
Added $streamQuality processing (watch.php)
2024-05-31 01:15:39 +03:00
282f11a894
Chore: eslint (event.js)
2024-05-31 01:11:55 +03:00
d4a963b7cf
Chore: eslint (watch.js)
2024-05-31 01:05:35 +03:00
7d86df0c04
Chore: eslint MonitorStream.js
2024-05-31 01:04:03 +03:00
0be93427c8
Added $streamQuality processing (watch.js)
2024-05-31 00:55:34 +03:00
5706bf2ade
Added $streamQuality processing (MonitorStream.js)
2024-05-31 00:51:49 +03:00
68e00d7d96
Added $streamQuality processing & other (event.js)
...
Added Scale display
Added $streamQuality processing
Added new options for selecting maximum width in $scales
Minor fixes related to Scale
Commented out unused code from the old version of Pan Zoom. In the future it should probably be completely removed.
2024-05-31 00:16:28 +03:00
18628dbc44
Added setting stream quality (config.php)
...
Measured in %
Used to change the Scale up (increase quality) or down (reduce network traffic)
2024-05-30 23:26:10 +03:00
7ab8bce06b
Merge branch 'ZoneMinder:master' into patch-132
2024-05-30 23:19:29 +03:00
3c8ebc8599
Don't show skin tab if both skin and css are forced
2024-05-30 13:44:47 -04:00
663665ccfa
Add possible config override of skin and css, forcing their use
2024-05-30 13:44:29 -04:00
fed15110fc
Allow config specifying favicon
2024-05-30 13:44:09 -04:00
94aab42356
Limit scale to 1.1 to prevent requesting images larger than 100%
2024-05-30 12:23:15 -04:00
f81d6fb823
Sanitise filter[Id]
2024-05-30 12:12:02 -04:00
b51c5df0cb
Sanitise displayinterval,speed and scale parameters. Fixes GHSA-pjjm-3qxp-6hj8
2024-05-30 12:11:45 -04:00
4602cd0470
Sanitise filter[Id] when parsing filter. Fixes GHSA-6rrw-66rf-6g5f
2024-05-30 12:10:45 -04:00
eb37693168
Fix: eslint added lost space (watch.js)
2024-05-30 01:05:17 +03:00
510784599c
Added Scales = Max 480, 640, 800, 1024, 1280, 1600 px (watch.js)
2024-05-30 01:02:11 +03:00
a86511bb40
Merge branch 'ZoneMinder:master' into patch-132
2024-05-30 00:58:58 +03:00
0fa220513d
Merge pull request #4056 from IgorA100/patch-130
...
Added starting/stopping monitor when show/hide Zones page
2024-05-29 17:27:50 -04:00
c812d9ea9a
Merge pull request #4057 from IgorA100/patch-131
...
Added starting/stopping monitor when show/hide Zone edit page
2024-05-29 17:27:31 -04:00
aabe577675
Added Scales = 480, 640, 800, 1024, 1280, 1600 px (config.php)
2024-05-29 22:23:01 +03:00
9a1d7e7467
Added starting/stopping monitor when show/hide page (zone.js)
...
I also added the functions panZoomOut(el) and panZoomIn(el) to avoid errors in the browser console.
I don't think it's necessary to fully implement PanZoom on this page. At least for now...
2024-05-29 19:54:28 +03:00
40216116f3
Added starting/stopping monitor when show/hide page (zones.js)
...
I also added the functions panZoomOut(el) and panZoomIn(el) to avoid errors in the browser console.
I don't think it's necessary to fully implement PanZoom on this page. At least for now...
2024-05-29 19:47:31 +03:00
05ef42c521
Removed extra newline (watch.js)
2024-05-29 19:32:24 +03:00
8dddcc3dbe
Removed creating a new monitorStream (watch.js)
...
My holey head....
2024-05-29 19:30:04 +03:00
9e8d1f66fb
Added if (!monitorStream.started) (watch.js)
2024-05-29 19:25:52 +03:00
40bbc082da
Added starting/stopping monitor when show/hide page (watch.js)
2024-05-29 19:15:54 +03:00
662fc2baf2
Turn on use strict
2024-05-29 10:26:42 -04:00
4a0ea62fa6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-29 10:10:54 -04:00
878c8a7687
In kill, turn the url from a streaming url into a single so as to actually stop the stream.
2024-05-29 10:10:36 -04:00
ca40a794d2
Added this.started = true/false when starting/stopping the monitor (MonitorStream.js)
2024-05-29 17:06:33 +03:00
3ece22446f
Start monitors when show page (montage.js)
2024-05-29 17:02:34 +03:00
db45047a3f
Merge pull request #4053 from IgorA100/patch-127
...
Stop monitors when closing montage page
2024-05-29 09:04:58 -04:00
0858d1c53b
Stop monitors when closing page (montage.js)
2024-05-29 14:37:22 +03:00
d2eb5237d3
Fix: PanZoom when exiting full screen mode (montage.js)
2024-05-29 13:43:26 +03:00
4baa2c0554
Remove stills option and add 1/10 and 1/2 rate options
2024-05-28 16:32:06 -04:00
1979d6665e
Fix seeking by clicking on timeline when using video.js
2024-05-28 16:31:51 -04:00
70c6375782
Add 1/10 and 1/2 frame rates and remove stills option as it can be done with pause. Remove zoom info title as it is now in includes/Monitor.php
2024-05-28 10:11:49 -04:00
69d5855653
Add another decimal digit to fps displays
2024-05-28 10:11:02 -04:00
7543e513fa
Replace useless title on image stream with a useful one describing zoom controls.
2024-05-28 10:10:30 -04:00
970af4976a
Merge pull request #4048 from IgorA100/patch-124
...
Chore: Mark "const el" as unused (watch.js)
2024-05-28 07:38:44 -04:00
110deed20f
Merge pull request #4047 from IgorA100/patch-123
...
Fix: Scrollbar style applied for "html" (skin.css)
2024-05-28 07:38:10 -04:00
d009b14fba
Chore: Mark "const el" as unused (watch.js)
2024-05-28 12:28:13 +03:00
6953dbd780
Fix: Scrollbar style applied for "html" (skin.css)
2024-05-28 11:55:46 +03:00
358a0d23ef
Replaced tabs with spaces (montage.js)
2024-05-28 00:55:55 +03:00
ab25a105da
Use "setMaxFPS(fps)" instead of "streamCommandstreamCommand({command: CMD_MAXFPS, maxfps: fps})" (montage.js)
2024-05-28 00:53:16 +03:00
faa3ed3aa7
Merge pull request #4042 from IgorA100/patch-119
...
Chore: Moved PanZoom functions to "web/js/panzoom.js"
2024-05-27 17:08:50 -04:00
e1a9a2c93b
Merge pull request #4044 from IgorA100/patch-120
...
Feat: Added Rate control on Montage page
2024-05-27 17:07:50 -04:00
f0b13f0c11
Fix: function "this.setMaxFPS" (MonitorStream.js)
...
The function didn't work!
The parameter "maxfps" was passed to the function, and "currentSpeed" was passed to "streamCommand" instead of "maxfps"
2024-05-27 22:58:41 +03:00
850ac711df
Removed extra semicolon (montage.js)
2024-05-27 22:48:42 +03:00
30d7c9a130
Added Rate control on Montage page (montage.php)
2024-05-27 22:43:52 +03:00
8e86879dd3
Added Rate control on Montage page (montage.js)
2024-05-27 22:35:22 +03:00
90ecbb8faf
Fix: scale calculation with "scale == 'fit_to_width'" watch.js
...
If scale == 'fit_to_width', then it is necessary to take into account the width of the screen, not the monitor element, because The monitor has not yet reached the correct size.
2024-05-27 21:23:13 +03:00
075bbfc244
Fix eslint (panzoom.js)
2024-05-27 19:37:49 +03:00
4aeec829b0
PanZoom code has been moved to 'web/js/panzoom.js'' (skin.js)
2024-05-27 19:34:56 +03:00
c582e7ab5b
Added file panzoom.js
2024-05-27 19:32:25 +03:00
8256cdef99
Load 'js/panzoom.js' file when needed (functions.php)
2024-05-27 19:31:20 +03:00
b1993f94ca
Fix: Changed "monitors[i].setScale" (watch.js)
...
Requires width & height
2024-05-27 18:46:58 +03:00
9ec5c1ad90
Fix: Calculation of Scale for Watch page (watch.js)
2024-05-27 18:39:16 +03:00
f97c453e73
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-27 10:01:33 -04:00
8712a0c189
Use parseInt on MaxImageBUffers because '0' is a true value
2024-05-27 10:01:27 -04:00
670a60373a
Chore: eslint (skin.js)
2024-05-27 16:20:19 +03:00
4a85901c44
Chore: eslint (skin.js)
2024-05-27 16:17:30 +03:00
eaaa9bfaab
Fix: Cursor type (skin.js)
2024-05-27 16:11:55 +03:00
166716e7c9
Moved PanZoom functions to skin.js (watch.js)
2024-05-27 15:41:21 +03:00
8bdb169fca
Removed function manageCursor (montage.js)
2024-05-27 15:36:49 +03:00
707ac6f9ec
Moved PanZoom functions to skin.js (event.js)
2024-05-27 15:34:44 +03:00
18d30fe0bb
Moved PanZoom functions to skin.js (montage.js)
2024-05-27 15:28:16 +03:00
53437b51ed
Moved PanZoom functions here (skin.js)
...
Moved from Montage, Watch & Event page
2024-05-27 15:11:34 +03:00
1b84a83d41
Chore: eslint (montage.js)
2024-05-26 22:35:50 +03:00
c5cd1b23c9
Optimizing code related to GridStack (montage.js)
...
And fix monitor positioning when switching Ratio
2024-05-26 22:29:30 +03:00
e716dca381
For custom layouts use a scale that gets us a width of 480px which is 25% of 1920.
2024-05-25 09:40:58 -04:00
2aecef113e
Only apply scale guessing if the layout is one of the predefined and hence known good layouts.
2024-05-25 09:27:11 -04:00
d00cc6f534
Merge pull request #4039 from IgorA100/patch-117
...
Fix: changedMonitors.forEach (montage.js)
2024-05-24 19:07:30 -04:00
f1b13e8eed
Update montage.js
2024-05-25 01:09:46 +03:00
d1f3a3f21d
Fix: changedMonitors.forEach (montage.js)
...
Iterating through the array was incorrect
2024-05-24 19:51:51 +03:00
00db9788d8
Limit scale to 100
2024-05-23 16:18:28 -04:00
84d38592db
Code cleanup allowing const variable
2024-05-23 16:18:00 -04:00
ae5b73bf90
Resolve conflicts
2024-05-23 14:30:44 -04:00
b3c90c3216
Merge branch 'master' into only_stream_visible
2024-05-23 14:18:47 -04:00
4fcc69e973
Remove Freeform references and rename default_layout_id to audoLayoutName
2024-05-23 14:07:25 -04:00
6243330e68
Merge branch 'master' into patch-115
2024-05-23 14:03:14 -04:00
217acd2e5f
Merge branch 'master' into patch-114
2024-05-23 13:48:53 -04:00
d84d67ee0b
Merge branch 'IgorA100-patch-116'
2024-05-23 13:46:34 -04:00
7c75356c8d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-05-23 13:46:28 -04:00
4e1396e539
Foot html footer back where it should be and move PRESET_LAYOUT_NAMES to montage.js.php
2024-05-23 13:46:19 -04:00
4fcc433880
Only change src if it exists. Fixes non-zms players
2024-05-23 13:45:49 -04:00
fdf4d83e02
Use else for micro-optimisation
2024-05-23 13:45:32 -04:00
e1a324a20c
Merge pull request #4035 from IgorA100/patch-116
...
Calculation of Scale before the start of monitors. Montage page
2024-05-23 13:45:08 -04:00
02ccb5f12b
Remove unused zms url parameters
2024-05-23 13:31:30 -04:00
b63412ad24
Rework the layout resorting code to make sense to Isaac. Apply a default scale value calculated based on 1920/columns to improve initial load.
2024-05-23 13:31:16 -04:00
743e31bbcf
Fix movableMonitorData montage.js
2024-05-23 19:46:28 +03:00
5b7a0745c9
Freefrom => Auto
2024-05-23 12:31:47 -04:00
d3e5a6be41
Put back fps reporting
2024-05-23 12:29:27 -04:00
f4e94404a1
add frames=1 to zms url so that it only spits out 1 jpeg. the canvas loading code can't handle mjpeg so we are just wasting bandwidth. Handle a null data in frames loading ajax.
2024-05-23 12:29:07 -04:00
10628346a8
Cancel changes (Monitor.php)
2024-05-23 19:19:50 +03:00
161928bf33
Calculation of Scale before the start of monitors (montage.js)
2024-05-23 19:17:49 +03:00
352aff02e4
Allow 0 for MaxImageBufferCount
2024-05-23 10:42:52 -04:00
10b39b965f
Start monitors always with Scale=25 (Monitor.php)
...
Dirty code (test only) fixes #4033
2024-05-23 01:30:29 +03:00
8ba0aa0be5
Changing the algorithm for counting the number of grid columns (montage.php)
...
if ($monitorCount <= 3) {
$default_layout = $monitorCount . ' Wide';
} else if ($monitorCount <= 4) {
$default_layout = '2 Wide';
} else if ($monitorCount <= 6) {
$default_layout = '3 Wide';
} else if ($monitorCount%4 == 0) {
$default_layout = '4 Wide';
} else if ($monitorCount%6 == 0) {
$default_layout = '6 Wide';
} else {
$default_layout = '4 Wide';
}
2024-05-23 00:37:41 +03:00
6286d51703
Changed the algorithm for calculating grid columns (montage.php)
...
More than 12 monitors - "6 Wide"
From 4 to 12 - "4 Wide"
Less than 4 - "2 Wide"
It will probably be better this way.
2024-05-23 00:10:32 +03:00
bf8306dbf7
Merge pull request #4030 from IgorA100/patch-112
...
Fix: placement of monitors when initializing Layout №2 (montage.js)
2024-05-22 17:00:55 -04:00
0a5cce4cab
Update montage.js
2024-05-22 23:04:40 +03:00
5fdac67540
Trying to completely get rid of jiggling montage layout (montage.js)
2024-05-22 23:03:26 +03:00
44a87bb137
Update montage.js
2024-05-22 21:13:29 +03:00
f1ac3f9486
Fix: Jiggling montage layout (montage.js)
...
Attempt to fix #4028
It seems to work for me, but there may be “side effects”, because... The analysis of monitor size changes is interrupted.
Additional testing is required.
2024-05-22 20:52:13 +03:00
3879fa7e9c
Chore: Fix eslint (montage.js)
2024-05-22 19:23:55 +03:00
Isaac Connor
IgorA100
Isaac Connor
Shobu UMEMURA