df411c3fe3
Merge pull request #3760 from criadoperez/fix/texts
...
Text corrections
2023-08-27 13:17:08 -04:00
6fd119157a
Text corrections
2023-08-27 02:00:59 +02:00
cf713b59d7
Add 500 and 1000 as pagination options
2023-08-25 19:02:17 -04:00
79b755047a
Add db update to correct column type of Longitude in Events and Servers table
2023-08-25 12:49:14 -04:00
194c5a0628
Add another Annke Hikvision mac address
2023-08-25 10:54:44 -04:00
9132f8947d
If scale is 0 or negative, then start with scale=100
2023-08-23 16:32:39 -04:00
76d5646cbf
Fix scaling being constantly set to 0 and hence logging a bogus value for scale
2023-08-23 16:32:13 -04:00
1dba6115b1
Fix eslint
2023-08-23 11:44:16 -04:00
5953b88085
Count keyframes on queuePacket so that analysis Ready() will start when out of order packets are present
2023-08-23 11:41:54 -04:00
f5380f1423
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-22 12:38:28 -04:00
1e423c151d
Stop infinite recursion when fail to load logout modal.
2023-08-22 12:20:11 -04:00
67e2c80851
Check for existence of modal before including it.
2023-08-22 12:19:48 -04:00
26948b9387
Merge pull request #3756 from criadoperez/fix/branch1
...
Some text corrections
2023-08-19 09:09:18 -04:00
6d1d08ce27
texts corrections on distros
2023-08-19 12:51:05 +02:00
ac86c31d01
cmakecacheimport parameters
2023-08-19 12:41:07 +02:00
2e21c747d4
cmake corrections
2023-08-19 12:39:32 +02:00
491b48f9f9
Only allow execute if you have EditEvents permission
2023-08-18 16:58:29 -04:00
9371c2775d
Use canEdit and canDelete to allow users without canEditEvents to create filters that don't act on events, only list them.
2023-08-18 16:57:51 -04:00
94ea51489b
Add canDelete and canEdit functions to Filter
2023-08-18 16:57:08 -04:00
ea581e521f
Add default value for order
2023-08-18 16:56:50 -04:00
61d0cec1fa
Debug the result of the auth header split, not the same line over and over
2023-08-18 16:56:37 -04:00
084fc8b651
Put users table in an options div, which has overflow-y: auto applied to it. Move buttons to top so they don't scroll
2023-08-18 12:12:30 -04:00
8748d6a1cc
Handle unset _SESSION['remoteAddr']
2023-08-16 15:23:34 -04:00
91b4e299b9
Demote failed login to Warn instead of Error
2023-08-16 10:37:06 -04:00
e163509d57
auto_reconnect id deprecated.
2023-08-16 09:53:07 -04:00
bdc8452891
Add a button to toggle ptz controls. Put ptz controls into a right hand sidebar.
2023-08-15 17:58:55 -04:00
5b7defb57b
Remove warnings about ControlDevice, because that is now channel. Detect duration not being in microseconds and adjust.
2023-08-15 14:02:12 -04:00
d31f918abc
Change the api for frameimage status request to split id into eid and fid instead of having id as an array.
2023-08-15 09:15:24 -04:00
9a229a78a5
Fix missing mac key on cameras array
2023-08-14 13:30:24 -04:00
9beacfa392
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-14 12:57:02 -04:00
9034bdffee
Add checking of keyframeinterval to Ready()
2023-08-14 12:56:48 -04:00
c2e00b8789
Merge pull request #3754 from joeknoll/master
...
Fix usage of unset variable
2023-08-13 21:16:52 -04:00
87f09d3b7e
Fix usage of unset variable
...
If daemon or args are unset the preg_replace is never called which can
result in count not having a value when referenced in the if statement.
This generates a warning in error.log.
2023-08-13 17:56:55 -07:00
07e60d924d
Merge pull request #3752 from criadoperez/fix/eslint
...
Fixed eslint checks
2023-08-13 13:26:03 -04:00
a40b3351ba
Merge pull request #3753 from criadoperez/fix/criadoperez4
...
Onvif typos
2023-08-13 13:24:44 -04:00
8e17d9075b
Onvif corrections
2023-08-13 18:57:36 +02:00
a93b67c9d8
Fixed eslint checks
2023-08-13 16:47:04 +02:00
aaff61f72f
Merge pull request #3751 from criadoperez/fix/criadoperez3
...
Typos on multiple files
2023-08-13 10:10:31 -04:00
543683aa4c
Corrections on cpp and h files
2023-08-13 01:27:19 +02:00
a5d83e61b4
Corrections on rst files
2023-08-13 01:20:29 +02:00
d21d53eeb9
Remove reorder_queue_size when re-parsing opts to avoid warnings
2023-08-12 14:50:30 -04:00
7122514a69
Add CURLOPT_SSL_VERIFYHOST an PEER so that SSL works.. not sure why SSL doesn't work. Add more debug and fix logic inversion on status result.
2023-08-11 17:48:34 -04:00
c5eec8fa12
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-10 11:03:30 -04:00
8672e6d64e
Fix missing dropdown-item class on warning or danger storage areas. Increase warning to 95% instead of 90%
2023-08-10 11:03:22 -04:00
9d5a1ec9d5
If scale is invalid, reset to auto so we don't constantly log the error.
2023-08-10 10:58:19 -04:00
b2993c3ec0
Use some const instead of var in changeScale
2023-08-09 19:29:19 -04:00
b8982dce53
When hiding/unhiding the monitor filter bar, when done call changeScale to readjust the size of teh video
2023-08-09 19:28:59 -04:00
10d70022fe
Handle when controls is not defined, like in WebSite monitors
2023-08-09 19:01:55 -04:00
7aa229658b
Slight cleanup of changeScale, converting it to float instead of string.
2023-08-09 19:01:30 -04:00
889c809e0b
Add RTSP2WebEnabled to defaults
2023-08-09 18:55:36 -04:00
Isaac Connor
Alejandro Criado-Pérez
Isaac Connor
Joe