Isaac Connor
8a496f5d17
Remove extra comma that now breaks php
2024-06-04 09:39:22 -04:00
Isaac Connor
6e9c69300b
Handle no rows return from Server_Stats
2024-06-02 16:04:15 -04:00
Isaac Connor
3c389e7f7f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-06-02 12:51:52 -04:00
IgorA100
eb1a38c74c
Changed attr "title" for "#monitor" (Monitor.php)
...
Made in two lines and added capital letters.
2024-06-02 00:07:37 +03:00
Isaac Connor
414b28d42a
Update style of variable embeddeding in string. php complains now
2024-05-31 14:53:45 -04:00
Isaac Connor
f81d6fb823
Sanitise filter[Id]
2024-05-30 12:12:02 -04:00
Isaac Connor
7543e513fa
Replace useless title on image stream with a useful one describing zoom controls.
2024-05-28 10:10:30 -04:00
Isaac Connor
02ccb5f12b
Remove unused zms url parameters
2024-05-23 13:31:30 -04:00
IgorA100
bd93a8e329
When setting cookies via PHP, add handling of the "path" value in the options (session.php)
...
Otherwise, cookies set via PHP will not be able to be changed in JS.
Because JS saves cookies with path="/"
Closed : #4024
2024-05-22 10:32:10 +03:00
IgorA100
41a92e11ad
Fix: block "Ratio Control" is created only for Montage page (Monitor.php)
...
Otherwise there will be an error in the browser console that the "changeRatio" function was not found
2024-05-21 19:34:06 +03:00
Isaac Connor
7a8f9a603d
Remove debug
2024-05-21 09:39:53 -04:00
Isaac Connor
9cc8ec7048
Santisize zmMontageLayout when passing to constructor
2024-05-21 09:22:55 -04:00
Isaac Connor
9dd58855d1
Santisize zmMontageLayout when passing to constructor
2024-05-21 09:21:54 -04:00
IgorA100
cb4481353b
Added "action" for the "delete" button (montage.php)
2024-05-21 12:07:35 +03:00
Isaac Connor
582f594b0f
Merge branch 'IgorA100-patch-6'
2024-05-15 11:46:26 -04:00
Isaac Connor
7bfd94b9d2
Merge branch 'patch-6' of github.com:IgorA100/zoneminder into IgorA100-patch-6
2024-05-15 11:45:49 -04:00
IgorA100
e995166dab
Added <select> for Ratio control & more (Monitor.php)
...
- Added <select> for Ratio control
- Reduced the size of the "Open watch page", "Edit monitor" buttons
- Added a button "Open full screen"
2024-05-14 13:14:43 +03:00
IgorA100
3648bfd56f
Merge branch 'ZoneMinder:master' into patch-6
2024-05-08 01:15:45 +03:00
IgorA100
4e7d774667
Added support for GridStack & PanZoom on Montage page (Monitor.php)
2024-05-07 19:31:25 +03:00
Isaac Connor
5047a18d4f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-04-30 08:57:51 -04:00
Isaac Connor
36ab6380cb
Include backtrace when complaining about lack of term in FilterTerm
2024-04-30 08:57:09 -04:00
Isaac Connor
f5333d2cfd
Fix redirect from controlcap to options=>control
2024-04-30 06:52:40 -04:00
Simpler1
ebf1e8b1cc
Fix(filter): Set tags operator to = instead of LIKE
2024-04-10 15:14:36 -04:00
IgorA100
c046c2ddc5
Merge branch 'ZoneMinder:master' into patch-6
2024-04-09 14:40:38 +03:00
IgorA100
51bf4bcbb8
Chore: Replace Tabs to Space
2024-04-08 19:21:30 +03:00
IgorA100
a720292025
Merge branch 'ZoneMinder:master' into patch-6
2024-04-07 20:45:21 +03:00
Isaac Connor
bec19f39e6
Fix comparison to True instead of true. Fixes #3952
2024-04-07 10:12:12 -04:00
IgorA100
49704656b8
Merge branch 'ZoneMinder:master' into patch-6
2024-04-05 22:58:55 +03:00
Isaac Connor
972a9e03af
Merge pull request #3920 from IgorA100/patch-45
...
Feat: Ability to download videos on Event view page with a multiport configuration
2024-04-05 09:47:16 -04:00
IgorA100
f2aed5fc21
Chore: Adjust spaces, tabs, newlines
2024-04-03 22:58:21 +03:00
Simpler1
1184ecf567
fix(events): Allow changing weekday after using filter
2024-04-01 08:24:31 -04:00
Isaac Connor
c28c5fd5e4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-30 13:57:38 -04:00
Simpler1
868bf988ce
chore(): Code consistency
2024-03-30 11:37:54 -04:00
Simpler1
6dff8760b7
chore(): Code consistency
2024-03-30 11:22:28 -04:00
Simpler1
170297db21
feat(): Term spacing on all views
2024-03-29 14:55:22 -04:00
IgorA100
c77078d098
Merge branch 'ZoneMinder:master' into patch-6
2024-03-28 23:31:53 +03:00
Isaac Connor
bd716789c2
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-28 12:48:53 -04:00
Isaac Connor
c2b6f6ba17
Detect when a new monitor uses a specified Id and the record exists in a deleted monitor. Automatically Undelete it.
2024-03-28 12:48:48 -04:00
IgorA100
70de139e77
Feat: Ability to download videos on the "Event" page with a multiport configuration
2024-03-28 19:47:53 +03:00
Isaac Connor
b143435c82
Merge pull request #3910 from IgorA100/patch-43
...
Feat: For <select> set .chosen & apply chosen
2024-03-28 12:35:46 -04:00
Isaac Connor
b7baab3394
Merge pull request #3915 from Simpler1/patch-6
...
chore(lint): $ locations
2024-03-28 10:17:12 -04:00
Simpler1
992b729329
chore(lint): $ locations
2024-03-28 09:59:58 -04:00
Isaac Connor
c8d9cd02d7
Fix use of int as a function instead of a cast
2024-03-28 09:02:53 -04:00
IgorA100
9068a5be85
Add .chosen for <select>
...
Previously, part of the code was not processed as "chosen" at all, other part of the code was processed by the script in filter.js, which resulted in "chosen" being processed in different places and in different styles.
Now all "chosen" processing happens in:
applyChosen() => \skins\classic\includes\functions.phpfunction
2024-03-28 12:33:59 +03: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
dc37a57dbc
Remove debug.
2024-03-26 18:41:32 -04:00
IgorA100
4f60769413
Fix: Now a single server is recorded in the database as 0, not NULL
2024-03-23 00:56:53 +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
76e2be6543
Set defaults for ONVIF_EVENTS_PATH and ONVIF_Alarm_Text
2024-03-22 09:12:07 -04:00
