Commit Graph

23408 Commits (19e6e9baf2de87621c3acc5240d79846beb0e513)

Author SHA1 Message Date
Isaac Connor 19e6e9baf2
Merge pull request #3707 from Simpler1/default_sound
feat(sound): Include default alarm sound (again)
2024-03-02 11:11:03 -05:00
Isaac Connor e4a2f9879e Don't assume video if not audio, could be data 2024-03-02 11:00:03 -05:00
Simpler1 7fdc204082 feat(): Custom snapp.ogg sound for ZoneMinder 2024-03-02 10:15:44 -05:00
Isaac Connor bb4858103d Increase time jump to 40 seconds because Avigilon cameras seem to do this a lot 2024-03-02 09:58:22 -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 8a42594009 Upgrade bootstrap-table to 1.22.3 2024-03-01 11:44:06 -05:00
Isaac Connor 753741ca78 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-29 23:33:03 -05:00
Isaac Connor 24e38f4d9e Add missing ONVIF_Event_Path from 1.37.54 update 2024-02-29 23:32:56 -05:00
Isaac Connor 02785fb81d
Merge pull request #3844 from IgorA100/patch-7
Adding and correcting Russian translation
2024-02-29 15:22:17 -05:00
Isaac Connor 9cd048d97b Only try to set monitor_permissions for non-deleted Monitors 2024-02-29 09:19:19 -05:00
Isaac Connor 04017b20f1 Make recording=onmotion respect post_event_count 2024-02-29 09:02:07 -05:00
Isaac Connor c33ec9833a Only show non deleted monitors in linked monitors 2024-02-29 08:59:14 -05:00
Isaac Connor a28df623f2 Fix canEdit is a hash, not a function 2024-02-27 19:18:09 -05:00
Isaac Connor 0128873ca7 Spacing, some better debug 2024-02-27 18:41:31 -05:00
Isaac Connor 3eede7228c Use Importance when logging about time jumping back too far 2024-02-27 17:39:52 -05:00
Isaac Connor c48ccd3ce2 Add autocomplete to onvif_username and fix case when local inputs aren't there after switching from non-local to local because Method is now wrong. 2024-02-27 17:39:34 -05:00
Isaac Connor ad53ebb8a8 Handle when inputs don't exist. 2024-02-27 17:38:48 -05:00
Isaac Connor c1b65185b5 Handle when inputs don't exist. 2024-02-27 17:38:45 -05:00
Isaac Connor c51c53c47a FIx use of inline javascript for the method dropdown on remote type monitors 2024-02-27 16:50:52 -05:00
IgorA100 742a821170
Add 'Decoder' => 'Декодер' 2024-02-28 00:30:43 +03:00
IgorA100 ebe8a26188
Add 'OnMotion' => 'При движении', 2024-02-28 00:26:30 +03:00
IgorA100 881cb5327e
Adding and correcting Russian translation 2024-02-28 00:19:47 +03:00
Isaac Connor 6da3fcd9cc Don't specify zm as the db 2024-02-27 09:24:14 -05:00
Isaac Connor f18f448a8c Fix setting frames 2024-02-26 16:22:51 -05:00
Isaac Connor 676569be99
Merge pull request #3842 from IgorA100/patch-5
Changing uptime return line parsing for CpuLoad() & add CpuNicePercent, CpuIdlePercent, CpuUsagePercent to Server_Stats
2024-02-26 15:55:53 -05:00
Isaac Connor c5db82c082 Remove TAPE state. 2024-02-26 15:47:39 -05:00
IgorA100 98a1c73fb2
Add CpuNicePercent, CpuIdlePercent, CpuUsagePercent to Server_Stats 2024-02-26 23:46:49 +03:00
IgorA100 d25a07eb04
Fix: ... 2024-02-26 23:19:28 +03:00
Isaac Connor e78c873944 Remove TAPE state. 2024-02-26 14:36:27 -05:00
Isaac Connor ed472bcfd7 Add remaining CpuUsage stats to Server_Stats 2024-02-26 13:54:48 -05:00
IgorA100 871ca68024
Changing uptime return line parsing for CpuLoad()
Changing uptime return line parsing for CpuLoad()
Depending on the locale it could be like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
or like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
2024-02-26 17:06:23 +03:00
Isaac Connor 6db5ec7374 Bump version for 1.37.54 db update 2024-02-25 10:09:52 -05:00
Isaac Connor 2c7f83f96f
Merge pull request #3841 from ovargasp/master
Makes the "Events" part of the ONVIF URL configurable
2024-02-24 16:22:01 -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 692e1ec745 Only allow loading user by only username if AUTH_RELAY=none. Log successful login as Debug 2024-02-24 07:54:40 -05:00
Isaac Connor e1a141ed7d Remove event_start_mode, not going to be used 2024-02-23 16:56:55 -05:00
Isaac Connor 06134c387b Remove event_start_mode, not going to be used 2024-02-23 16:52:21 -05:00
Isaac Connor 5e704c3a1c Remove event_start_mode, not going to be used 2024-02-23 16:51:13 -05:00
Isaac Connor 29d120f059 Add CLOSE_DURATION, remove EventStartMode 2024-02-23 16:50:57 -05:00
Isaac Connor 920568c704 Use switch instead of ifs and add CLOSE_DURATION as valid value 2024-02-23 16:50:44 -05:00
Isaac Connor 989b3b7ba4
Merge pull request #3838 from IgorA100/patch-3
Fix: Logging levels coloring for languages other than English
2024-02-23 09:01:19 -05:00
Isaac Connor ed64db315b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-23 08:56:32 -05:00
Isaac Connor a738f1bc2e Remove unused EventStartMode. Fixes #3839 2024-02-23 08:56:26 -05:00
Isaac Connor 6e5d26f294 Bump to 1.37.53 2024-02-22 16:58:54 -05:00
Isaac Connor 78ab72a0d9 Remove EventStartMode stuff 2024-02-22 16:58:14 -05:00
Isaac Connor 824d6ec032 Remove EventStartMode stuff 2024-02-22 16:58:03 -05:00
Isaac Connor 87d71a030a Add EventCloseMode to Monitors 2024-02-22 16:13:34 -05:00
Isaac Connor 4c38d5ba75 Merge branch 'master' into event_start_mode 2024-02-22 16:13:16 -05:00
Isaac Connor 00155dc841 Fix CpuSysPercent to CpuSystemPercent 2024-02-22 16:06:27 -05:00
Isaac Connor 5fd7e9faf5 Add CpuUserPercent, CpuNicePercent, CpuSystemPercent, CpuIdlePercent, CpuUsagePercent to Servers table 2024-02-22 16:06:03 -05:00