Isaac Connor
|
411807c7b0
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-09-28 10:27:38 -04:00 |
|
Isaac Connor
|
7a3134ae5e
|
Fix restart login in functions. Only start zmc if function is not None and start zma if it isn't None or NoDect. Even if disabled, we still run zma so that we can send it a signal to enable motion detection.
|
2019-09-28 10:26:50 -04:00 |
externo6
|
7479d3f1f1
|
Add LIKE and NOT LIKE to filter options
This is useful for filtering notes.
EG filtering detected objects from zmeventnofification;
WHERE notes LIKE %detect%
WHERE notes NOT LIKE %car%
|
2019-09-28 13:03:16 +01:00 |
|
Isaac Connor
|
8940ca420c
|
Use iconzm docker for disco
|
2019-09-26 17:23:58 -04:00 |
|
Isaac Connor
|
288448a545
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-26 16:27:56 -04:00 |
|
Isaac Connor
|
ebcacaa660
|
Use material icons for buttons
|
2019-09-26 16:26:37 -04:00 |
|
Isaac Connor
|
b1bcfe8a9b
|
fix backtrace
|
2019-09-26 16:26:28 -04:00 |
|
Isaac Connor
|
fdaee75310
|
Use material icons for buttons. Hide the stop button because it does nothing.
|
2019-09-26 16:26:18 -04:00 |
|
Isaac Connor
|
e4265bd075
|
spaces
|
2019-09-26 16:13:49 -04:00 |
|
Isaac Connor
|
555f3e9c0d
|
Fix missing semi colon in Content-Security-Policy-Report-Only
|
2019-09-26 13:52:27 -04:00 |
|
Isaac Connor
|
492be7cc33
|
make last_zoom last_scale last_x and last_y members of the StreamBase object instead of static vars so that we can access them in monitorStream
|
2019-09-26 13:51:49 -04:00 |
|
Isaac Connor
|
b787682fa9
|
Fix play from pause when not buffering. When change of zoom, send two paused images so that response is instant. Fix some misplaced line feeds.
|
2019-09-26 13:51:13 -04:00 |
|
Isaac Connor
|
675db328e7
|
enable bionic iconzm docket repo
|
2019-09-25 12:00:32 -04:00 |
|
Isaac Connor
|
1dda79af46
|
remove debug
|
2019-09-25 12:00:00 -04:00 |
|
Isaac Connor
|
61a7c008eb
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-25 10:36:52 -04:00 |
|
Isaac Connor
|
84d68f549f
|
enable iconzm docker for stretch
|
2019-09-25 10:36:12 -04:00 |
|
Isaac Connor
|
4deea4c6ab
|
code doc
|
2019-09-25 10:35:57 -04:00 |
|
Isaac Connor
|
2b017f782b
|
Fix missing eid= from View All/View Pages links
|
2019-09-25 10:35:41 -04:00 |
|
Isaac Connor
|
bcb8389923
|
spaces
|
2019-09-25 10:16:27 -04:00 |
|
Isaac Connor
|
b936fbac6a
|
Don't import Monitor.php unless we need to
|
2019-09-25 10:16:16 -04:00 |
|
Isaac Connor
|
fe893a4a01
|
Add report-uri to out Content-Security-Policy-Report-Only header
|
2019-09-25 10:16:02 -04:00 |
|
Isaac Connor
|
ca40e760f7
|
get global cspNonce
|
2019-09-25 10:15:32 -04:00 |
|
Isaac Connor
|
54dec069cd
|
correct quotes and use a button on loging page
|
2019-09-25 10:15:12 -04:00 |
|
Isaac Connor
|
1b653e7e79
|
Add warnings for when SaveJPEGs and VideoWriter are both set to disabled
|
2019-09-25 10:14:41 -04:00 |
|
Isaac Connor
|
5c80e098c5
|
Only save Group changes if there were changes
|
2019-09-25 10:14:12 -04:00 |
|
Isaac Connor
|
475432449f
|
Add default values for Status record
|
2019-09-25 10:13:56 -04:00 |
|
Isaac Connor
|
afd10e49d6
|
spaces, quotes extra braces
|
2019-09-25 10:13:32 -04:00 |
|
Isaac Connor
|
80710e6551
|
use @PERL_EXECUTABLE@
|
2019-09-24 10:12:44 -04:00 |
|
Isaac Connor
|
d4a8c96ede
|
Build and deploy packages for every commit for debian/ubuntu/raspbian
|
2019-09-23 13:10:14 -04:00 |
|
Isaac Connor
|
766a59884d
|
Don't hard code perl path. Use PERL_EXECUTABLE cmake var
|
2019-09-23 12:54:27 -04:00 |
|
Isaac Connor
|
d16d77d6b3
|
quotes and spacing
|
2019-09-23 12:39:24 -04:00 |
|
Isaac Connor
|
dfa51c4e3f
|
update of zmtrack.pl. include id in logfile.
|
2019-09-23 12:38:58 -04:00 |
|
Isaac Connor
|
bc33c0bcb5
|
make zmcontrol log to zmcontrol_id.log
|
2019-09-23 12:21:59 -04:00 |
|
Isaac Connor
|
a05c513643
|
Revert change breaking multiport when servers not defined.
|
2019-09-23 12:03:19 -04:00 |
|
Isaac Connor
|
c7d7d45380
|
Remove :'s, they can be added using css if desired
|
2019-09-23 11:49:39 -04:00 |
|
Isaac Connor
|
538478ff1c
|
Need to -1 on the dimensions when comparing to points as they are 0-based
|
2019-09-23 11:48:58 -04:00 |
|
Isaac Connor
|
1dd09923eb
|
Add special case for just rotating the monitor dimensions and add out of bounds check for zone points
|
2019-09-23 11:42:49 -04:00 |
|
Isaac Connor
|
15a1b19b42
|
spaces
|
2019-09-23 10:53:21 -04:00 |
|
Isaac Connor
|
83e477e6be
|
CaptureAndRecord in remote camera rtsp doesn't work. Remove it.
|
2019-09-23 10:52:57 -04:00 |
|
Isaac Connor
|
9a94ce6e41
|
remove debug
|
2019-09-23 10:22:25 -04:00 |
|
Isaac Connor
|
23b3ae5783
|
Remove debug
|
2019-09-22 21:06:54 -04:00 |
|
Isaac Connor
|
8d95b2f5f8
|
Don't select Layout when changing size in montage
|
2019-09-22 14:22:24 -04:00 |
|
Isaac Connor
|
4c3ea7125d
|
Add defaults to Frame
|
2019-09-22 14:21:59 -04:00 |
|
Isaac Connor
|
96024b518e
|
Do per commit builds for debian and ubuntu
|
2019-09-22 13:02:13 -04:00 |
|
Isaac Connor
|
0ec215c95f
|
Only try to install deb on trusty as that is the environment that travis is running
|
2019-09-22 12:52:46 -04:00 |
|
Isaac Connor
|
48cb568424
|
fix docker repo
|
2019-09-22 12:10:56 -04:00 |
|
Isaac Connor
|
7b9eaf42b8
|
Fix selecting group from groups listing under monitor name. Fixes #2711
|
2019-09-22 12:03:34 -04:00 |
|
Isaac Connor
|
8226e3c233
|
Update hebrew language
|
2019-09-22 12:02:31 -04:00 |
|
Isaac Connor
|
240a355b72
|
list me as maintainer and uploader
|
2019-09-21 12:10:33 -04:00 |
|
Isaac Connor
|
69e460c5cd
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-21 11:06:28 -04:00 |