Isaac Connor
|
7f2bf04c2f
|
Merge branch 'cookie_http_only' into storageareas
|
2016-12-08 14:26:13 -05:00 |
|
Isaac Connor
|
2c0a868eea
|
fix typo
|
2016-12-08 11:02:59 -05:00 |
Andrew Bauer
|
ecbaaef59a
|
Merge pull request #1670 from connortechnology/fix_braces
Fix braces
|
2016-12-06 08:39:43 -06:00 |
Kyle Johnson
|
49620d51b9
|
Merge pull request #1692 from ZoneMinder/small_fixes
Small fixes
|
2016-11-24 20:42:45 -07:00 |
Isaac Connor
|
cf49a234b3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-11-22 13:05:03 -05:00 |
|
Isaac Connor
|
9e8404516b
|
add a zmMemInvalidate at the beginning of the while loop to catch unreleased mmap files
|
2016-11-22 11:02:38 -05:00 |
|
Isaac Connor
|
02cd3e8cba
|
Merge branch 'master' into small_fixes
|
2016-11-22 10:52:07 -05:00 |
|
Isaac Connor
|
27b5b60eae
|
Merge branch 'master' into fix_braces
|
2016-11-14 21:46:25 -05:00 |
|
Isaac Connor
|
911256785e
|
Merge branch 'fix_braces' into storageareas
|
2016-11-08 13:14:12 -05:00 |
|
Isaac Connor
|
1be6c57aee
|
fix extra semi colon
|
2016-11-08 13:11:10 -05:00 |
|
Isaac Connor
|
5f0c1c0e26
|
fix layout in a complex map
|
2016-11-08 12:55:07 -05:00 |
|
Isaac Connor
|
4b3ac63a68
|
merge master, deprecate qqq()
|
2016-11-08 11:30:44 -05:00 |
|
Isaac Connor
|
eb2177e76a
|
whitespace fixes in prep for merging master
|
2016-11-08 10:44:00 -05:00 |
|
Andrew Bauer
|
29e48da3b9
|
fix sftp xfers in zmfilter (#1677)
|
2016-11-07 16:08:43 -05:00 |
|
Isaac Connor
|
0dbde8e290
|
correct a lot of braces
|
2016-11-04 15:53:14 -04:00 |
|
Isaac Connor
|
93725b3f4b
|
fixup spacing in ConfigData
|
2016-11-04 14:05:51 -04:00 |
|
Isaac Connor
|
3d17067276
|
change tabs to spaces
|
2016-11-03 14:30:23 -04:00 |
|
Isaac Connor
|
68c8178648
|
remove some extra spaces
|
2016-11-03 14:21:07 -04:00 |
|
Isaac Connor
|
bb371612c3
|
tabs to spaces
|
2016-11-03 14:18:03 -04:00 |
|
Isaac Connor
|
d9a31f7fb6
|
Merge branch 'master' into storageareas
|
2016-10-26 13:39:31 -04:00 |
Andrew Bauer
|
191efed8e3
|
change fast_delete to off - fixes #1597
|
2016-10-19 14:10:28 -05:00 |
|
Isaac Connor
|
10e451faa6
|
fix log line
|
2016-10-02 12:23:19 -04:00 |
|
Isaac Connor
|
a77de33997
|
add a test for lib existence
|
2016-09-27 12:51:04 -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
|
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
|
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 |
|
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
|
25d58f5192
|
quote the password
|
2016-08-02 13:22:44 -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
|
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
|
6129732e61
|
restore the behaviour where the generated file names are printed to stdout.
|
2016-07-11 08:01:43 -04:00 |
|
Andy Bauer
|
19265b631a
|
custom banner text on web console
|
2016-07-09 13:11:30 -05:00 |
|
Isaac Connor
|
1069b301a0
|
functions have been moved from ConfigAdmin to Config
|
2016-06-12 15:38:59 -04:00 |
|
Isaac Connor
|
1983f106f4
|
Add a missing sth->finish
|
2016-05-27 09:01:01 -04:00 |
|
Isaac Connor
|
b0116f25e9
|
put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo
|
2016-05-27 08:59:46 -04:00 |
|
Isaac Connor
|
f969186abb
|
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
|
2016-05-26 11:15:13 -04:00 |
|
Isaac Connor
|
795665f8c7
|
Merge branch 'startup_time' into storageareas
|
2016-09-29 11:07:55 -04:00 |