be27630a85
escape the word Groups
2020-11-23 19:33:53 -05:00
4deb3a8d84
escape the word Groups
2020-11-23 19:31:21 -05:00
1b5448ede4
Handle there being no services in the response
2020-11-20 16:35:48 -05:00
ec5e6b392b
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-11-16 11:33:00 -05:00
5bf5d58ac1
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:32:50 -05:00
52b4c6b089
Merge pull request #3076 from BlueMax/zmlinkcontent
...
Honor conf.d (zmlinkcontent.sh)
2020-11-11 20:48:05 -05:00
02f2c86d43
Honor conf.d (zmlinkcontent.sh)
...
Signed-off-by: Bluemax <1403092+BlueMax@users.noreply.github.com>
2020-11-12 01:32:15 +01:00
2c5b13d001
Revert to FriendsOfCake instead of our fork, as they have merged our patch.
2020-11-11 12:09:25 -05:00
746882ba85
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
2020-11-05 13:45:02 -05:00
c4eb59442e
Changed "Purge By Age" filter
...
Changed "Purge By Age" filter, the "date" option is not available in v1.34.22. Using "End Date" as the filter parameter works just fine.
2020-11-05 12:27:46 -05:00
a0f733615c
allow empty string as a default value
2020-10-22 11:26:34 -04:00
40c57b4b23
Improve logic in set, improve logging
2020-10-22 10:43:53 -04:00
6c546f36ae
allow dashes and underscores in log file name
2020-10-22 10:43:35 -04:00
8a6aaa019f
Bump version for release to 1.34.22
2020-10-19 14:29:18 -04:00
0e63874533
fix calling changeScale when scale is 0 instead of auto
2020-10-19 14:28:21 -04:00
127ef9a130
Fix scaling when using ScaleToFit
2020-10-19 14:28:02 -04:00
080557d580
add an id to buttons div so that we can use it when calling scaleToFit
2020-10-19 14:27:43 -04:00
617a1faa99
Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0
2020-10-19 13:25:26 -04:00
eefbed04c1
Add debugging for min_section_length keeping us in ALERT
2020-10-19 13:24:30 -04:00
df2f5f814b
fix case in mocord where cause would not contain motion
2020-10-19 13:24:08 -04:00
cc24df9593
init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them
2020-10-19 13:23:40 -04:00
14894dfb00
remove extra comma
2020-10-19 09:08:25 -04:00
220a89b459
fix eslint
2020-10-17 16:17:30 -04:00
06c8ce57c2
Make zm_terminate available to anyone who includes zm.h
2020-10-16 20:06:53 -04:00
2f06a79ad8
fix compiler warnings
2020-10-16 20:04:26 -04:00
78cbacae2e
When changing rates, if not using video.js, send CMD_VARPLAY to tell zms what to do
2020-10-15 17:18:38 -04:00
5869817e0d
set playbackrates in video.js to match the ones offered by the zms player. Use the rates array set in includes/config.php
2020-10-15 17:17:20 -04:00
3c5dc8e8b3
Add line breaks in select options
2020-10-15 17:16:14 -04:00
7bb227283d
Update rates in includes/config.php
2020-10-15 17:15:54 -04:00
ba3b19d89a
Clean up DiskSpace option. Doesn't need to be there and shouldn't set HashDiskPercent
2020-10-14 16:45:03 -04:00
e9fb150880
Improve error message when a row doesn't exist in the Monitor_Status table
2020-10-14 11:32:33 -04:00
86e744777c
Put back return on error
2020-10-08 09:12:37 -04:00
c28ff1f2b4
Include loading EndTime when loading Events data so that we can determine if an event is in-progress
...
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
7cc023c1ec
Update Event details when writing Frame Data. Write Frame Details when inserting a Bulk Frame
2020-10-07 18:37:38 -04:00
044ce61ddb
Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be.
2020-10-06 16:47:51 -04:00
d7429014b6
Convert progress to a double instead of int.
2020-10-06 16:36:56 -04:00
061c889394
Implement SEEK to offset using two 32bit integers to represent the double value
2020-10-06 16:35:46 -04:00
0e89d28c26
Send SEEK as two integers representing a float
2020-10-06 16:34:06 -04:00
de6a51ec15
Fix incorrect operator used for NOT IN and add IN operator to match php
2020-10-06 09:38:15 -04:00
b27eac3cbf
Make centerCoord take a font size parameter to fix centering when using large font.
2020-10-05 16:12:48 -04:00
1c2dd92d31
Add LabelSize to get label_size from monitor
2020-10-05 16:12:33 -04:00
93ecb87caa
Clear the textframe before Annotating it.
2020-10-05 16:12:09 -04:00
c1c407ea39
debug new offset as well when SEEKING
2020-10-05 15:55:42 -04:00
3db8490d9c
Escape another case of Function for mysql8
2020-09-25 10:59:31 -04:00
f4f02e24bd
Use /run/zm instead of /var/run/zm
2020-09-25 09:48:56 -04:00
52ca2abf69
Quote some more MySQL8 Reserved keywords
...
See:
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295/comments/1
https://github.com/ZoneMinder/zoneminder/issues/2659
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
2020-09-25 09:37:21 -04:00
32e0c92747
After adding SaveJPEGs to Events, need to populate them with SaveJPegs from MOnitors
2020-09-24 13:43:05 -04:00
2457dcb16f
Minimum value for label position is 0, not 1.
2020-09-22 13:12:39 -04:00
2f03ceeccf
log referer when unable to authenticate
2020-09-22 13:10:39 -04:00
a43cbc05af
Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output
2020-09-21 13:03:03 -04:00
Isaac Connor
Isaac Connor
Bluemax
Esteban Flores
Isaac Connor
Joseph Yasi
Isaac Connor