Isaac Connor
|
10e451faa6
|
fix log line
|
2016-10-02 12:23:19 -04:00 |
|
Isaac Connor
|
795665f8c7
|
Merge branch 'startup_time' into storageareas
|
2016-09-29 11:07:55 -04:00 |
|
Isaac Connor
|
29c015ecd3
|
need to put zmGetStartupTime in exports
|
2016-09-29 11:07:33 -04:00 |
|
Isaac Connor
|
5c867aa5f5
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:10:38 -04:00 |
|
Isaac Connor
|
8bc7b9562f
|
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
|
2016-09-29 10:04:53 -04:00 |
|
Isaac Connor
|
b074a3257d
|
add StartTime to log line about deleting an event.
|
2016-09-28 08:35:19 -04:00 |
|
Isaac Connor
|
89d4b9fec5
|
ifdef the libswresample lib stuff
|
2016-09-27 13:34:10 -04:00 |
|
Isaac Connor
|
a77de33997
|
add a test for lib existence
|
2016-09-27 12:51:04 -04:00 |
|
Isaac Connor
|
f40c8d0da8
|
contains due to glob
|
2016-09-20 15:54:37 -04:00 |
|
Isaac Connor
|
a3e99cf08d
|
quick update to Monitor to use Object methods
|
2016-09-20 12:15:48 -04:00 |
|
Isaac Connor
|
e228de6ebe
|
detect relative path for ZM_PATH_EVENTS and use ZM_PATH_WEB to make a full path
|
2016-09-19 16:44:43 -04:00 |
Isaac Connor
|
ae4a4681cd
|
fix using wrong var
|
2016-09-15 11:41:42 -04:00 |
|
Isaac Connor
|
8f33ed6ca6
|
introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started.
|
2016-09-15 11:16:05 -04:00 |
|
Isaac Connor
|
2b4bad86cb
|
Merge branch 'master' into storageareas
|
2016-09-13 10:21:10 -04:00 |
|
Isaac Connor
|
5fb1c45c4e
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-08 11:34:36 -04:00 |
|
Isaac Connor
|
7b0a14ee72
|
change doulbe quotes to single quotes. Detect if we can't chdir into the monitor dir.
|
2016-09-08 11:06:02 -04:00 |
|
Isaac Connor
|
e51cc7efc8
|
add a missing / in error message
|
2016-08-31 11:21:46 -04:00 |
mdrush
|
69a71b1a37
|
cleaned up logic
|
2016-08-27 16:16:01 -07:00 |
|
mdrush
|
16a9de3b1b
|
added missing brackets
|
2016-08-27 15:39:04 -07:00 |
|
mdrush
|
2d161924c0
|
changed error message to debug message
|
2016-08-27 15:34:10 -07:00 |
|
mdrush
|
52255e594e
|
improved style, added fallback when ssmtp can't be found
|
2016-08-27 15:18:00 -07:00 |
|
mdrush
|
574390730a
|
added missing ssmtp support in sendMessage
|
2016-08-27 13:10:39 -07:00 |
|
Isaac Connor
|
747382f214
|
change double quotes to single quotes. When can't connect, print out the path to the sock file
|
2016-08-22 13:34:02 -04:00 |
|
Isaac Connor
|
d618b612fe
|
google code style & whitespace
|
2016-08-22 12:08:49 -04:00 |
|
Isaac Connor
|
707694d4ea
|
google code style
|
2016-08-22 11:41:26 -04:00 |
|
Isaac Connor
|
eafe3d7748
|
Merge branch 'master' into storageareas
|
2016-08-17 10:31:55 -04:00 |
|
Isaac Connor
|
69461a7c1b
|
Merge pull request #1579 from peruchi/master
Update file sock for multiserver
|
2016-08-17 10:23:01 -04:00 |
peruchi
|
50f55af68f
|
Update zmdc.pl.in
|
2016-08-17 10:36:00 -03:00 |
|
peruchi
|
7b389a79a6
|
Update zmdc.pl.in
|
2016-08-17 09:45:30 -03:00 |
|
Isaac Connor
|
3d65b0d2ad
|
Merge branch 'master' into storageareas
|
2016-08-08 18:09:11 -04:00 |
|
Isaac Connor
|
2451768295
|
Merge branch 'master' into storageareas
|
2016-08-08 18:08:46 -04:00 |
|
Isaac Connor
|
fbc0086fcc
|
get the other dbPass use and quote it. Slight visual code style cleanup.
|
2016-08-08 16:52:09 -04:00 |
Andrew Bauer
|
24d471f452
|
Merge pull request #1503 from ZoneMinder/id_on_console
add option to show monitor ID on console
|
2016-08-06 10:59:03 -05:00 |
|
Isaac Connor
|
9d65ef3bb2
|
Merge pull request #1556 from knnniggett/banner
custom banner text on web console
|
2016-08-06 10:59:53 -04:00 |
|
Andrew Bauer
|
528230c92d
|
Merge pull request #1581 from ZoneMinder/fix_1571
quote the password
|
2016-08-06 09:37:11 -05:00 |
|
Andrew Bauer
|
382896dc0d
|
Merge pull request #1498 from josh4trunks/mysql_port_socket
Add support for MySQL Port / Unix Socket
|
2016-08-06 09:32:32 -05:00 |
|
Andrew Bauer
|
e6b1cf90df
|
Merge pull request #1566 from gerdesj/Keekoon
Control script for Keekoon cameras.
|
2016-08-06 09:09:40 -05:00 |
|
Isaac Connor
|
99289e4713
|
Deprecate MAX_AGED_DIRS. Only check age if the fs event isn't in the db. This should work much better.
|
2016-08-04 12:22:33 -04:00 |
|
peruchi
|
0d85d3e60d
|
Update zmdc.pl.in
|
2016-08-02 16:26:27 -03:00 |
|
peruchi
|
0238656542
|
Update file sock for multiserver
Added the ZM_SERVER_ID in the creation the sock for not to give conflict in mode multi server.
|
2016-08-02 15:36:40 -03:00 |
|
Isaac Connor
|
62d3c66e8f
|
Merge branch 'fix_1571' into storageareas
|
2016-08-02 13:53:32 -04:00 |
|
Isaac Connor
|
25d58f5192
|
quote the password
|
2016-08-02 13:22:44 -04:00 |
|
Isaac Connor
|
208337635a
|
Merge branch 'master' into storageareas
|
2016-08-01 19:30:01 -04:00 |
Jon Gerdes
|
ee720c4561
|
Control script for Keekoon cameras. Tested with KK002.
|
2016-07-25 11:20:49 +01:00 |
Dmitry Smirnov
|
aed3c3d29a
|
reduce noise on "zmupdate.pl" invocation
|
2016-07-14 00:43:32 +10:00 |
|
Isaac Connor
|
8eac8a1e1a
|
Merge branch 'master' into storageareas
|
2016-07-13 09:50:30 -04:00 |
|
Isaac Connor
|
85c0377280
|
When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it
|
2016-07-12 14:21:54 -04:00 |
|
Isaac Connor
|
1e2ec7028e
|
better debugging. add back deleting of zmswap files. detaint them so that they can be deleted. Use Objects to fix up deleting events
|
2016-07-12 14:16:20 -04:00 |
|
Isaac Connor
|
26369268bb
|
merge Steve's updates, work on zmaudit
|
2016-07-12 11:27:25 -04:00 |
|
Isaac Connor
|
6129732e61
|
restore the behaviour where the generated file names are printed to stdout.
|
2016-07-11 08:01:43 -04:00 |