Isaac Connor
|
cea86e9d4e
|
Only add about zoneminder links if ZM_HOME_ABOUT is set
|
2025-07-05 12:03:08 -04:00 |
|
Isaac Connor
|
7c81957aa2
|
Extend session around the setting of css, skin and navbar_type. Default navbar_type to what is in session
|
2025-07-05 12:02:43 -04:00 |
|
Isaac Connor
|
225b428592
|
Rework left vs top as NAVBAR_TYPE
|
2025-07-05 11:46:06 -04:00 |
|
Isaac Connor
|
d4f370c3f3
|
Add navbar_type to js
|
2025-07-05 11:45:43 -04:00 |
|
IgorA100
|
8220407774
|
Changed "Use old menu view" to "Use Top menu" (functions.php)
|
2025-07-02 18:48:57 +03:00 |
|
IgorA100
|
a26a2e8020
|
Merge branch 'master' into patch-826436
|
2025-07-02 15:54:06 +03:00 |
|
Isaac Connor
|
a27a1bc5e5
|
Use post instead of get. Fixes #4345
|
2025-07-02 08:29:48 -04:00 |
|
IgorA100
|
d2710e41f7
|
Update MonitorStream.js
|
2025-07-02 14:25:01 +03:00 |
|
Isaac Connor
|
7b67f641b8
|
Merge pull request #4343 from IgorA100/patch-741858
Fix: Show control buttons on hover only on the displayed stream on Montage page
|
2025-07-02 07:21:44 -04:00 |
|
IgorA100
|
999a60a7af
|
Update MonitorStream.js
|
2025-07-02 14:15:52 +03:00 |
|
IgorA100
|
9121e58d4a
|
For tracking mouse movement we now use vanilla JS instead of JQ (montage.js)
This allows for more flexible tracking of mouse movement.
|
2025-07-02 12:38:00 +03:00 |
|
IgorA100
|
68591585b8
|
Revert changes (Monitor.php)
|
2025-07-02 12:12:24 +03:00 |
|
IgorA100
|
e108bda566
|
Added support for "ZM_WEB_NAVBAR_LINKS" for the menu in the left sidebar (functions.php)
|
2025-07-01 00:43:16 +03:00 |
|
Isaac Connor
|
104901c8f8
|
fix eslint, remove debug
|
2025-06-29 09:27:31 -04:00 |
|
Isaac Connor
|
e482f0658d
|
Merge pull request #4311 from IgorA100/patch-617239
Feat: Added left side menu
|
2025-06-28 14:55:23 -04:00 |
|
IgorA100
|
c7704fc018
|
Moved $blockRatioControl (Monitor.php)
|
2025-06-28 01:03:22 +03:00 |
|
IgorA100
|
9be7a3413f
|
Separate mouse hover control on ".monitorStream" and ".grid-monitor" montage.js
|
2025-06-28 00:44:27 +03:00 |
|
IgorA100
|
5a01104bcc
|
Fix: Show control buttons on hover only on the displayed stream (montage.js)
This will avoid unnecessary display of buttons when hovering over the "Monitor status" line if it is displayed "Outside bottom"
|
2025-06-28 00:25:19 +03:00 |
|
Isaac Connor
|
19018e1320
|
Only list players that are allow for the monitor
|
2025-06-26 17:37:00 -04:00 |
|
Isaac Connor
|
8f23953ecc
|
Add video-stream.js to montage
|
2025-06-26 17:36:40 -04:00 |
|
Isaac Connor
|
043c3f72a6
|
Add styles to video-stream to match video,svg,img
|
2025-06-26 17:36:18 -04:00 |
|
Isaac Connor
|
25f03a5e3e
|
Allow Go2RTC/RTSP2Web or Janus when player is not specified
|
2025-06-26 17:18:02 -04:00 |
|
Isaac Connor
|
e42d31fe3b
|
Fix not being able to turn off Go2RTCEnabled
|
2025-06-26 16:28:16 -04:00 |
|
Isaac Connor
|
de0f534a2d
|
Use a span instead of div so that player doesn't drop to new line
|
2025-06-26 15:44:02 -04:00 |
|
Isaac Connor
|
ce3c1ceb01
|
Add Go2RTCEnable
|
2025-06-26 15:08:04 -04:00 |
|
Isaac Connor
|
68fa95d468
|
Move getStreamModeMonitors to monitor->getSTreamMode. Add Volume/Mute. Change behaviour of Play/Pause to only show one of them at a time.
|
2025-06-26 15:05:03 -04:00 |
|
Isaac Connor
|
b0fdc628d1
|
Add Go2RTC support. Cleanup RTSP2Web and Janus code. Add volume and mute button support.
|
2025-06-26 15:02:34 -04:00 |
|
Isaac Connor
|
ac7f292ba1
|
Add Go2RTC_Enabled to monitor data
|
2025-06-26 15:00:04 -04:00 |
|
Isaac Connor
|
80e46948c1
|
Add blob for hls.js
|
2025-06-26 14:57:50 -04:00 |
|
Isaac Connor
|
fee01f9c9b
|
Add Go2RTC support to monitor
|
2025-06-26 14:57:06 -04:00 |
|
Isaac Connor
|
9784a97a05
|
Add content id to frames div to fix lack of scroll. Fixes #4341
|
2025-06-24 12:38:32 -04:00 |
|
Isaac Connor
|
6e6feba300
|
Put the links in a li
|
2025-06-23 12:47:29 -05:00 |
|
Isaac Connor
|
762ee7a2a3
|
Rough in navbar additional links functionality
|
2025-06-23 11:59:44 -05:00 |
|
Isaac Connor
|
ce76f953dc
|
Use limit if it is specified
|
2025-06-21 21:43:01 -04:00 |
|
Isaac Connor
|
a45c7b3f37
|
When hovering over thumbnail images, change the positioning to absolute so it isn't constrained by it's container
|
2025-06-20 10:17:04 -04:00 |
|
Isaac Connor
|
4864bef942
|
Fix preview orientation at screen bottom
|
2025-06-20 09:41:22 -04:00 |
|
Isaac Connor
|
eeca6a579d
|
Apparently we have to set style, font etc before each call to filltext
|
2025-06-19 19:02:07 -04:00 |
|
Isaac Connor
|
f813c32db1
|
Fix parsing of filter elements to generate min & maxTimeSecs. Clean up drawGraph a bit
|
2025-06-19 18:53:31 -04:00 |
|
Isaac Connor
|
4b7e923789
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2025-06-19 17:24:27 -04:00 |
|
Isaac Connor
|
c7953f3188
|
Don't call setSpeed(index) when speed is already 0, prevents infinite loop. Change changeDateTime to changeFilter. Add code to try to update minTime and maxTime from the filter
|
2025-06-19 17:24:15 -04:00 |
|
Isaac Connor
|
7f9cde76b5
|
More gracefully handle NaN so that hopefully the real error won't get lost in the noise
|
2025-06-19 17:03:38 -04:00 |
|
IgorA100
|
ec8d920315
|
Added a link to zmninja.zoneminder.com "functions.php" to the menu
|
2025-06-17 22:28:19 +03:00 |
|
Isaac Connor
|
83afd88b50
|
Rename config to dnsmasq_config and configvals=>out_configvals because those are globals
|
2025-06-17 09:45:44 -05:00 |
|
Isaac Connor
|
cd8f3120c9
|
Rename global config to zm_config as we use config elsewhere and it conflicts
|
2025-06-17 09:45:44 -05:00 |
|
Isaac Connor
|
136e73c74a
|
Remove debug and useless code.
|
2025-06-13 17:24:38 -04:00 |
|
Isaac Connor
|
657af6a628
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2025-06-13 09:34:36 -04:00 |
|
IgorA100
|
8e5c69fd5f
|
Merge branch 'master' into patch-617239
|
2025-06-12 17:44:07 +03:00 |
|
Isaac Connor
|
bdeb748894
|
Remove some debug
|
2025-06-11 15:05:45 -04:00 |
|
Isaac Connor
|
1997dfcc1c
|
Update montagereview from another dev branch. The main gist is that we no longer pre-populate events in the js code included with html. We load by ajax now from the API. This reduces the amount of ram used by php. The rest is basically code and white space cleanups.
|
2025-06-11 15:03:05 -04:00 |
|
Isaac Connor
|
d97b37f83f
|
Don't do pagination in events.This may break users of API but pagination should only happen if asked for
|
2025-06-11 14:57:54 -04:00 |
|