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
51bf4bcbb8
Chore: Replace Tabs to Space
2024-04-08 19:21:30 +03:00
Isaac Connor
bec19f39e6
Fix comparison to True instead of true. Fixes #3952
2024-04-07 10:12:12 -04: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
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
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
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
ef5e90d669
Improve logic of DiskSpace pre condition. Implement specific op support, instead of using unsafe eval.
2024-03-20 10:22:15 -04:00
Simpler1
8b94b0774f
feat(events): Narrow mode layout (mobile portrait)
2024-03-20 10:09:01 -04:00
Isaac Connor
1ae7c9c4b1
Add UI for setting StartupDelay
2024-03-19 14:59:04 -04:00
Isaac Connor
b647280766
FIx arrap_map to array_map. Don't assume _REQUEST[mids] exists. Fixes #3859
2024-03-10 10:59:56 -04:00
Isaac Connor
55df0fd8f7
Only save permissions if passed in POST. We might not be able to see all monitors, so might not exist in POST.
2024-03-05 16:33:41 -05:00
Isaac Connor
b5e1d5e611
Fix invalid canEditMonitor call, simplify login in canView and canEdit to prefer per-monitor permissions
2024-03-05 14:02:01 -05:00
Isaac Connor
b4bbff6353
Use per-monitor permissions
2024-03-05 14:00:40 -05:00
Isaac Connor
ecab601c21
Use array_values to discard the keys in the array of monitorIds
2024-03-01 16:13:52 -05:00
Isaac Connor
9cd048d97b
Only try to set monitor_permissions for non-deleted Monitors
2024-02-29 09:19:19 -05:00
Server
58d8cf0adf
Makes the "Events" part of the ONVIF URL configurable
...
as required per some ONVIF version 21.06 cameras
by default sets the Events Path equals to "/Events"
to maintain functionality
2024-02-24 11:05:08 -06:00
Isaac Connor
a738f1bc2e
Remove unused EventStartMode. Fixes #3839
2024-02-23 08:56:26 -05:00
Isaac Connor
ebad97038e
Implement CpuLoad in Server object
2024-02-22 12:52:49 -05:00
Isaac Connor
799dcd5f51
Default thisServer to a default server object.
2024-02-22 12:52:39 -05:00
Isaac Connor
eeb8856157
Ad EventStartMode and EventCLoseMode to monitor
2024-02-22 10:46:36 -05:00
Isaac Connor
edcf09882f
Subsitute a 0 when ZM_SERVER_ID is not defined
2024-02-21 16:35:04 -05:00
Isaac Connor
f54f10df72
Add server stats fields
2024-02-20 13:14:23 -05:00
Server
0ff48f631e
Implements an option to disable soap_wsa code that doesn't work
...
with some chinese cameras, more common to Latam zone
2024-02-12 19:22:01 -06:00
Isaac Connor
51020e92a4
Merge pull request #3822 from IgorA100/patch-1
...
Sorting an array of events when merging into a file
2024-02-09 10:35:05 -05:00
Isaac Connor
8bb368fe13
Fix children MonitorIds not being included due to the use of + instead of array_merge
2024-02-09 10:33:22 -05:00
IgorA100
a204a973f1
Code optimization
2024-02-09 18:09:51 +03:00
IgorA100
d0dc4bcbe1
Sorting an array of events when merging into a file
...
When merging events into a file, they must first be sorted by time and start date of the event.
2024-02-09 17:34:06 +03:00
Isaac Connor
31af9d905c
Still generate an auth if no password present.
2024-02-08 13:31:21 -05:00