Isaac Connor
|
869860bb26
|
Merge branch 'master' into zma_to_thread
|
2020-07-21 17:49:39 -04:00 |
Isaac Connor
|
7575afc8d5
|
Merge branch 'master' into zma_to_thread
|
2020-07-21 17:38:32 -04:00 |
Isaac Connor
|
926c3b8d34
|
Isaac added these explicit zmc~_heartbeat and zma_heartbeat entries.
|
2020-07-13 14:53:03 -04:00 |
Joseph Yasi
|
cc93d553d8
|
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-07-10 23:11:59 +02:00 |
Isaac Connor
|
cd707571e7
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2020-07-08 17:22:32 -04:00 |
Isaac Connor
|
a469fdef9a
|
include the non-existent path in the warning
|
2020-07-08 17:21:59 -04:00 |
Isaac Connor
|
e5afc1a2db
|
Cleanup code that sets digest credentials. Fixes #2972
|
2020-07-08 17:20:52 -04:00 |
Isaac Connor
|
209cbe1000
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-07 09:23:46 -04:00 |
Isaac Connor
|
b0f87eabc2
|
comment out hexdump stuff to remove the dependency
|
2020-07-07 09:23:32 -04:00 |
Andrew Bauer
|
dcab218a2e
|
remove global config item CREATE_ANALYSIS_IMAGES
|
2020-07-06 12:22:41 -05:00 |
Isaac Connor
|
2db65d3821
|
Merge branch 'release-1.34'
|
2020-07-04 09:09:24 -04:00 |
Isaac Connor
|
db5370024a
|
implement moveMap and moveRel. Please note that many cameras do not implement these functions and may even report that they do implement them and then silently do nothing when you use them. So YMMV
|
2020-07-04 09:02:01 -04:00 |
Isaac Connor
|
ab98deafd7
|
Add Log cleaning to zm_stats.pl
|
2020-07-02 16:02:49 -04:00 |
Isaac Connor
|
c022cae7ef
|
Sleep 10 secs if db connection fails to reduce log spamming and load
|
2020-06-30 18:59:27 -04:00 |
Isaac Connor
|
aff7e27dee
|
remove debug in zmtrack.pl.in
|
2020-06-30 18:58:46 -04:00 |
Brandon Myers
|
ce4e04cd0b
|
Fix typo in AUTH_TYPE help text
|
2020-06-27 00:23:05 -05:00 |
Isaac Connor
|
73ec5f10a5
|
sendCmd failures should not be fatal
|
2020-06-26 16:52:34 -04:00 |
Isaac Connor
|
d1e7d396f7
|
zmcontrol needs to be able to take floats instead of integers for it's parameters
|
2020-06-26 16:49:55 -04:00 |
Isaac Connor
|
e618966e08
|
spacing, improve error message when can't connect.
|
2020-06-23 10:23:17 -04:00 |
Isaac Connor
|
d984c33b92
|
Replace old message abou ensuring that ZM is stopped with our new one, which only pauses if ZMIS running.
|
2020-06-09 13:36:33 -04:00 |
Isaac Connor
|
a2a28d389e
|
Finish exporting and fixing new systemStatus packageControl and daemonControl functions
|
2020-06-09 13:35:52 -04:00 |
Isaac Connor
|
5e0f1a03c5
|
Detect if system is running and prompt to stop it before doing the update.
|
2020-06-09 13:19:19 -04:00 |
Isaac Connor
|
d4488ac4e1
|
spacing
|
2020-06-09 12:18:29 -04:00 |
Isaac Connor
|
58ae7bb342
|
die early if db connection fails
|
2020-06-07 11:57:20 -04:00 |
Isaac Connor
|
d59697b9b5
|
fix event->self
|
2020-06-07 11:57:08 -04:00 |
Isaac Connor
|
a719565bf3
|
Merge branch 'master' into add_user_to_filters
|
2020-06-05 19:03:23 -04:00 |
Isaac Connor
|
d0a24ae32b
|
Make all Filters operate on in-progress events
|
2020-06-05 18:01:20 -04:00 |
Isaac Connor
|
caa48e7b80
|
Finish canEdit function
|
2020-06-05 17:50:52 -04:00 |
Isaac Connor
|
0905655377
|
Merge branch 'master' into add_user_to_filters
|
2020-06-05 17:08:14 -04:00 |
Isaac Connor
|
f71926c736
|
Merge branch 'release-1.34'
|
2020-06-05 10:09:07 -04:00 |
Isaac Connor
|
20e6a1f53d
|
Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password.
|
2020-06-04 11:37:44 -04:00 |
Isaac Connor
|
f8a11633bb
|
Handle no db_host specified, meaning local unix socket
|
2020-06-04 11:35:48 -04:00 |
Isaac Connor
|
6869710747
|
Handle no db_host specified, meaning local unix socket
|
2020-06-04 11:28:26 -04:00 |
Isaac Connor
|
ade0d750c8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-06-03 15:37:32 -04:00 |
Isaac Connor
|
6f42cb22d6
|
Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password.
|
2020-06-03 15:36:47 -04:00 |
Kevin Stolp
|
0e6ff1ad09
|
Detaint mysql commands in update script
|
2020-06-01 22:54:29 -07:00 |
Isaac Connor
|
a7ef8e3dc8
|
detaint command before performing backup. Fixes #2945
|
2020-05-29 14:53:42 -04:00 |
Isaac Connor
|
58a015e20a
|
fix use of printMsg
|
2020-05-29 12:20:39 -04:00 |
Isaac Connor
|
b99059638a
|
Use plural soap versions
|
2020-05-18 17:57:40 -04:00 |
Isaac Connor
|
5f5cede104
|
Fix log file containing - or _
|
2020-05-13 16:06:26 -04:00 |
Isaac Connor
|
437a96915f
|
sketchy fix for soap 1.1
|
2020-05-13 15:24:58 -04:00 |
Isaac Connor
|
fc12b61750
|
Fix probing
|
2020-05-13 15:09:31 -04:00 |
Isaac Connor
|
e24b6214b1
|
test logFile before doing regexps on it
|
2020-05-13 08:05:58 -04:00 |
Isaac Connor
|
f72ad1023c
|
As params are passed in command, they should not be fatal to the control process
|
2020-05-13 08:02:40 -04:00 |
Isaac Connor
|
a6b804bb62
|
As params are passed in command, they should not be fatal to the control process
|
2020-05-13 07:58:53 -04:00 |
Isaac Connor
|
a1217db117
|
hardcode log id
|
2020-05-12 18:20:05 -04:00 |
Isaac Connor
|
011ea1098c
|
Rename COnfig* to ONVIF_*
|
2020-05-12 15:49:54 -04:00 |
Isaac Connor
|
045ea77bf3
|
Pass verbose to client. Add stream type to profiles. Add passing generic commands to the media element so that we can query anything we want easier
|
2020-05-12 15:49:42 -04:00 |
Isaac Connor
|
43b776bc80
|
Remove duplicated code byusing a foreach. Add streamtype to returned profiles
|
2020-05-12 15:49:01 -04:00 |
Isaac Connor
|
1f3cf266a2
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
|
2020-05-12 11:20:49 -04:00 |