Isaac Connor
|
436cd3397b
|
apply a top/bottom margin to buttons of 1px to create a tiny space between buttons and console table. Remove commented out styles
|
2021-01-22 15:46:48 -05:00 |
Terry Sanders
|
c21e02e3c7
|
Fixed issue where mysql_free_result can get called twice when a vaild username with an incorrect password is used.
|
2021-01-22 12:23:38 -05:00 |
|
Isaac Connor
|
f9fc10b394
|
When not capturing don't try to create mmap. Fixes #3112
|
2021-01-22 12:23:13 -05:00 |
|
Isaac Connor
|
01ec57f902
|
remove test for negative pts. Negative pts is ok. Have been running this in master for a while with no negative effects.
|
2021-01-22 12:07:47 -05:00 |
|
Isaac Connor
|
7183a47a3a
|
split Netcat security header into multiple lines for legibility
|
2021-01-15 18:45:13 -05:00 |
|
Isaac Connor
|
b019a759a3
|
ffmpeg options doesn't support loglevel setting. SO remove it from help. Fixes #3109
|
2021-01-15 18:43:49 -05:00 |
|
Isaac Connor
|
c9ac5dff62
|
Use parent printMsg
|
2020-12-21 12:17:02 -05:00 |
|
Isaac Connor
|
a855656b88
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-12-17 09:27:23 -05:00 |
|
Isaac Connor
|
5602b92699
|
Fix issue with timeline where it only shows first frame
|
2020-12-17 09:26:59 -05:00 |
|
Isaac Connor
|
ea6478b8a0
|
Escape column names for mysql 8. Fixes #3092
|
2020-12-05 16:38:53 -05:00 |
|
Isaac Connor
|
fdbca4760f
|
dbFetchAll should always return an array. Not null on error
|
2020-12-05 16:38:25 -05:00 |
|
Isaac Connor
|
d781d7169a
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-12-03 14:29:01 -05:00 |
|
Isaac Connor
|
b30b4cd66a
|
Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081
|
2020-12-03 14:28:48 -05:00 |
Isaac Connor
|
38d9aaea1f
|
Merge pull request #3084 from BlueMax/660fix
Improve group permissions (mode 660)
|
2020-12-02 16:00:47 -05:00 |
Bluemax
|
d8993931da
|
Improve group permissions (mode 660)
Make /dev/shm files 660.
|
2020-12-02 21:27:00 +01:00 |
|
Isaac Connor
|
48775e2230
|
Fix Clear Log by using minTime and maxTime as timestamps. Fix export including unselected filters. Can't just serialize the form asit may contain fields in teh querystring so you get an array of values instead of a single value
|
2020-12-01 14:24:41 -05:00 |
|
Isaac Connor
|
baeb1dbd5b
|
Take an optional debug param in dbQuery
|
2020-12-01 14:07:23 -05:00 |
|
Isaac Connor
|
ae7a706526
|
Handle minTime and maxTime being specified as either a timstamp or a datetime. Remove duplicated query building code. Reduce ram requirements when exporting logs.
|
2020-12-01 14:04:51 -05:00 |
|
Isaac Connor
|
be27630a85
|
escape the word Groups
|
2020-11-23 19:33:53 -05:00 |
|
Isaac Connor
|
4deb3a8d84
|
escape the word Groups
|
2020-11-23 19:31:21 -05:00 |
|
Isaac Connor
|
1b5448ede4
|
Handle there being no services in the response
|
2020-11-20 16:35:48 -05:00 |
|
Isaac Connor
|
ec5e6b392b
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-11-16 11:33:00 -05:00 |
|
Isaac Connor
|
5bf5d58ac1
|
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
|
2020-11-16 11:32:50 -05:00 |
|
Isaac Connor
|
52b4c6b089
|
Merge pull request #3076 from BlueMax/zmlinkcontent
Honor conf.d (zmlinkcontent.sh)
|
2020-11-11 20:48:05 -05:00 |
Bluemax
|
02f2c86d43
|
Honor conf.d (zmlinkcontent.sh)
Signed-off-by: Bluemax <1403092+BlueMax@users.noreply.github.com>
|
2020-11-12 01:32:15 +01:00 |
|
Isaac Connor
|
2c5b13d001
|
Revert to FriendsOfCake instead of our fork, as they have merged our patch.
|
2020-11-11 12:09:25 -05:00 |
|
Isaac Connor
|
746882ba85
|
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
|
2020-11-05 13:45:02 -05:00 |
Esteban Flores
|
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 |
|
Isaac Connor
|
a0f733615c
|
allow empty string as a default value
|
2020-10-22 11:26:34 -04:00 |
|
Isaac Connor
|
40c57b4b23
|
Improve logic in set, improve logging
|
2020-10-22 10:43:53 -04:00 |
|
Isaac Connor
|
6c546f36ae
|
allow dashes and underscores in log file name
|
2020-10-22 10:43:35 -04:00 |
|
Isaac Connor
|
8a6aaa019f
|
Bump version for release to 1.34.22
|
2020-10-19 14:29:18 -04:00 |
|
Isaac Connor
|
0e63874533
|
fix calling changeScale when scale is 0 instead of auto
|
2020-10-19 14:28:21 -04:00 |
|
Isaac Connor
|
127ef9a130
|
Fix scaling when using ScaleToFit
|
2020-10-19 14:28:02 -04:00 |
|
Isaac Connor
|
080557d580
|
add an id to buttons div so that we can use it when calling scaleToFit
|
2020-10-19 14:27:43 -04:00 |
|
Isaac Connor
|
617a1faa99
|
Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0
|
2020-10-19 13:25:26 -04:00 |
|
Isaac Connor
|
eefbed04c1
|
Add debugging for min_section_length keeping us in ALERT
|
2020-10-19 13:24:30 -04:00 |
Isaac Connor
|
df2f5f814b
|
fix case in mocord where cause would not contain motion
|
2020-10-19 13:24:08 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
14894dfb00
|
remove extra comma
|
2020-10-19 09:08:25 -04:00 |
|
Isaac Connor
|
220a89b459
|
fix eslint
|
2020-10-17 16:17:30 -04:00 |
|
Isaac Connor
|
06c8ce57c2
|
Make zm_terminate available to anyone who includes zm.h
|
2020-10-16 20:06:53 -04:00 |
|
Isaac Connor
|
2f06a79ad8
|
fix compiler warnings
|
2020-10-16 20:04:26 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
3c5dc8e8b3
|
Add line breaks in select options
|
2020-10-15 17:16:14 -04:00 |
|
Isaac Connor
|
7bb227283d
|
Update rates in includes/config.php
|
2020-10-15 17:15:54 -04:00 |
|
Isaac Connor
|
ba3b19d89a
|
Clean up DiskSpace option. Doesn't need to be there and shouldn't set HashDiskPercent
|
2020-10-14 16:45:03 -04:00 |
|
Isaac Connor
|
e9fb150880
|
Improve error message when a row doesn't exist in the Monitor_Status table
|
2020-10-14 11:32:33 -04:00 |
|
Isaac Connor
|
86e744777c
|
Put back return on error
|
2020-10-08 09:12:37 -04:00 |