Isaac Connor
|
43b4177a5b
|
fix crash due to incomplete code
|
2020-08-27 08:14:45 -04:00 |
|
Isaac Connor
|
0f27243007
|
Merge branch 'master' into filter_pre_post
|
2020-08-24 09:23:24 -04:00 |
|
Isaac Connor
|
0873b8a0ec
|
Remove long-deprecated config entries
|
2020-08-22 18:49:20 -04:00 |
|
Isaac Connor
|
9f9b771d3f
|
remove dead code
|
2020-08-22 10:58:16 -04:00 |
|
Isaac Connor
|
b589c3abd9
|
glob sorts since perl 5.6.0
|
2020-08-21 10:45:32 -04:00 |
|
Isaac Connor
|
46aaddeac5
|
Sort loading of conf.d config files. Also ignore db Config table entries that have already been defined in conf.d files so that they take precedence.
|
2020-08-20 20:44:28 -04:00 |
|
Isaac Connor
|
b8433373b5
|
Rough in Pre and Post SQL Conditions in execute. Rough in ExistsInFileSystem support. Needs more work.
|
2020-08-15 17:49:11 -04:00 |
|
Isaac Connor
|
49316244a8
|
Merge branch 'master' into filter_pre_post
|
2020-08-13 13:46:35 -04:00 |
|
Isaac Connor
|
ac9432edf4
|
Older cameras don't have that file. It's ok for it to return a 404.
|
2020-08-11 15:17:27 -04:00 |
dmo
|
c102c35c42
|
Don't prefix manpage with zoneminder-
|
2020-08-05 23:56:30 +02:00 |
Andrew Bauer
|
3ba8ad579e
|
fix pod2man out-of-source builds
|
2020-08-04 21:18:37 -05:00 |
|
Andrew Bauer
|
92cc03dbe8
|
fix pod2man out-of-source builds
|
2020-08-04 21:07:49 -05:00 |
|
Andrew Bauer
|
8d9410d510
|
spelling
|
2020-08-03 15:38:02 -05:00 |
|
Andrew Bauer
|
9d88f8ee73
|
implement zm about menu
|
2020-08-03 15:22:46 -05:00 |
|
Andrew Bauer
|
b6c0274b2c
|
implement collapsed navbar
|
2020-07-31 16:03:37 -05:00 |
|
Isaac Connor
|
34b079fa9e
|
Start roughing in pre and post conditions
|
2020-07-30 12:13:09 -04:00 |
|
Isaac Connor
|
5bea68c93d
|
add comment and improve logging of figuring out event starttime from youngest file
|
2020-07-28 10:35:28 -04:00 |
|
Isaac Connor
|
89007227b6
|
Add reboot method to SkyIPCam7xx control script
|
2020-07-23 11:54:19 -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 |
|
Isaac Connor
|
bbcb7f2c60
|
Better debug output on errors. Use libXML to pretty-print the returned XML
|
2020-05-12 11:14:56 -04:00 |
|
Isaac Connor
|
e40c3d8487
|
Print out the returned profiles like profiles() used to do
|
2020-05-12 10:49:47 -04:00 |
|
Isaac Connor
|
e950f3c843
|
Return profiles instead of doing nothing with them
|
2020-05-12 10:49:29 -04:00 |
|
Isaac Connor
|
323c171a27
|
test logFile before doing regexps on it
|
2020-05-11 18:35:31 -04:00 |
|
Isaac Connor
|
77b4dd6b35
|
add POD and fixups to zmonvif-trigger.pl
|
2020-05-11 18:34:38 -04:00 |
|
Isaac Connor
|
415ffbd771
|
remove weird comments
|
2020-05-09 18:30:21 -04:00 |
|
Isaac Connor
|
8c133fc973
|
use perl executable replacement
|
2020-05-09 17:36:51 -04:00 |
|
Isaac Connor
|
183fe1febd
|
remove +x and move zmtrigger.pl to /scripts
|
2020-05-09 17:36:20 -04:00 |
|
Isaac Connor
|
80ed0b219a
|
Add zmonvif-trigger.pl and split into multiple lines
|
2020-05-09 17:35:27 -04:00 |
|
Isaac Connor
|
7938952a90
|
Fix botched merge in ONVIF.PM
|
2020-05-09 12:22:11 -04:00 |
|
Isaac Connor
|
8bebb2b890
|
fix use of printMsg
|
2020-05-09 11:49:02 -04:00 |
|
Isaac Connor
|
cd9d3311ed
|
Add a User object script
|
2020-05-07 11:07:27 -04:00 |
|
Isaac Connor
|
4bd0cca4b8
|
Update Filter object, specifying fields and using parent's find methods
|
2020-05-07 10:59:06 -04:00 |
|
Isaac Connor
|
58fae48736
|
Add canEdit tests to delete,delete_files,CopyTo,MoveTo
|
2020-05-07 10:58:31 -04:00 |
|
Isaac Connor
|
ac31abd30c
|
Make onvif handle no resolution graceully
|
2020-05-05 18:07:12 -04:00 |
|
Isaac Connor
|
3ac6dc267b
|
out an error if name contains invalid characters
|
2020-04-23 11:01:34 -04:00 |
|
Isaac Connor
|
57141fddeb
|
handle additional atributes on the html tag in html detection
|
2020-04-23 10:46:18 -04:00 |
|
Isaac Connor
|
576e3149d6
|
escape table columns for mysql8
|
2020-04-23 10:43:01 -04:00 |
|
Isaac Connor
|
7046612b65
|
Code style updates. Quote the word Function in SQL for newer mysql
|
2020-04-23 10:41:59 -04:00 |
|
Isaac Connor
|
67b35967d4
|
MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once.
|
2020-04-23 10:39:50 -04:00 |
|
Isaac Connor
|
a7b553cdbe
|
code style and correct license. Author was contacted and ok'd the change. Fies #2883
|
2020-04-23 10:37:42 -04:00 |
|
Isaac Connor
|
e770be2e13
|
Merge branch 'release-1.34'
|
2020-04-23 10:26:16 -04:00 |
|
Isaac Connor
|
10d89ed82e
|
Spacing, quotes, improve debug messages.
|
2020-04-23 10:00:11 -04:00 |
|
Isaac Connor
|
571ff260cc
|
Merge branch 'release-1.34'
|
2020-04-04 16:35:09 -04:00 |
|
Isaac Connor
|
38555b0dd4
|
strip leading and trailing " in trigger message. Accept a space instead of a + in enable/disable commands to match on/off
|
2020-04-04 11:08:19 -04:00 |
|
Isaac Connor
|
3117f29f71
|
code style and correct license. Author was contacted and ok'd the change. Fies #2883
|
2020-03-30 10:32:26 -04:00 |
|
Isaac Connor
|
98598f1441
|
Add a warning when an email exceeds 10Mb
|
2020-03-28 11:59:19 -04:00 |
|
Isaac Connor
|
bfa08c3422
|
MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once.
|
2020-03-27 13:06:10 -04:00 |
Pliable Pixels
|
cf6b24b432
|
add ES status to telemetry and --show option to display what is being sent to ZM
|
2020-03-26 12:11:00 -04:00 |
|
Pliable Pixels
|
090cd845b0
|
add ES status to telemetry and --show option to display what is being sent to ZM
|
2020-03-16 14:49:27 -04:00 |
|
Isaac Connor
|
0323925406
|
Code style updates. Quote the word Function in SQL for newer mysql
|
2020-03-04 09:48:55 -05:00 |
|
Isaac Connor
|
7c066822f3
|
escape table columns for mysql8
|
2020-03-03 17:29:31 -05:00 |
|
Isaac Connor
|
4dee3532c3
|
handle additional atributes on the html tag in html detection
|
2020-02-26 09:42:17 -05:00 |
|
Isaac Connor
|
d51fdafbc0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-21 09:37:45 -05:00 |