arjunrc
|
38bca6b95d
|
added CMD_QUIT to kill zms via command
|
2016-01-29 09:58:57 -05:00 |
Isaac Connor
|
f275498790
|
Add Debug for sql used to load other than local monitors
|
2016-01-26 21:00:32 -05:00 |
|
Isaac Connor
|
902065a6c1
|
Add Debug for sql used to load local monitors
|
2016-01-26 20:59:07 -05:00 |
|
Isaac Connor
|
f357ea6ccd
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-12-28 11:53:04 -05:00 |
|
Isaac Connor
|
ccded54937
|
put back missing col++
|
2015-12-28 11:52:40 -05:00 |
SteveGilvarry
|
3f1c782ff7
|
Fix random extra semicolon
|
2015-12-28 16:29:04 +11:00 |
|
Isaac Connor
|
e76cc59bad
|
revert whitespace changes
|
2015-12-21 13:42:44 -05:00 |
|
Isaac Connor
|
36f83aa412
|
revert whitespace changes
|
2015-12-21 13:35:17 -05:00 |
|
Isaac Connor
|
609ab79f81
|
revert whitespace changes
|
2015-12-21 13:32:57 -05:00 |
|
Isaac Connor
|
1fee421500
|
revert whitespace changes
|
2015-12-21 13:29:41 -05:00 |
|
Isaac Connor
|
c0a79567e6
|
revert whitespace changes
|
2015-12-21 13:26:24 -05:00 |
|
Isaac Connor
|
fdf1912ec1
|
revert whitespace changes
|
2015-12-21 13:11:18 -05:00 |
|
Isaac Connor
|
af9fc1de90
|
revert white space changes.
|
2015-12-21 12:57:05 -05:00 |
|
Isaac Connor
|
f7cc2fb44f
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-11-23 10:42:14 -05:00 |
Andrew Bauer
|
a9609d2a43
|
fix mem alloc fault in zm_monitor.cpp
|
2015-11-21 12:17:23 -06:00 |
Isaac Connor
|
ac8bfc71dc
|
fix specifying ServerId
|
2015-10-02 18:22:48 +00:00 |
|
Isaac Connor
|
6ff4e333b4
|
Merge branch 'fix_warnings' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-10-02 15:34:05 +00:00 |
|
Isaac Connor
|
7b253bcd7e
|
Debug line
|
2015-10-02 15:28:51 +00:00 |
|
Isaac Connor
|
8125ef0334
|
change types and move things around to remove compile warnings
|
2015-10-02 09:49:09 -04:00 |
Andrew Bauer
|
4a978034ad
|
Merge pull request #1056 from ZoneMinder/fix_privacy_mask_segfaults
Fix sgfault caused by the privacy mask stuff
|
2015-09-16 10:46:45 -05:00 |
|
Isaac Connor
|
b8f2b1e0a0
|
Merge branch 'mmap_fd_gt_3' into multi-server
|
2015-09-16 11:01:06 -04:00 |
|
Isaac Connor
|
d991912ce4
|
Merge branch 'fix_privacy_mask_segfaults' into multi-server
|
2015-09-16 11:00:57 -04:00 |
|
Isaac Connor
|
e70d49b033
|
Merge branch 'fix_privacy_mask_segfaults' into mmap_fd_gt_3
|
2015-09-16 10:58:57 -04:00 |
|
Isaac Connor
|
6e12febf3d
|
initialize privacy_bitmask and check it before deletep[] to prevent segfault
|
2015-09-16 10:51:27 -04:00 |
|
Isaac Connor
|
0571ca3025
|
quick fix for #1055: make sure our mmap fd is > 2
|
2015-09-16 09:11:22 -04:00 |
|
Isaac Connor
|
bb41ebf776
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-08-31 16:03:40 -04:00 |
|
Andy Bauer
|
395e628541
|
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
Conflicts:
CMakeLists.txt
configure.ac
version
|
2015-08-29 07:57:18 -05:00 |
|
Isaac Connor
|
09e5463a81
|
test for value in server_id before atoi
|
2015-08-27 11:16:58 -04:00 |
|
Isaac Connor
|
bca9a19488
|
tabs to spaces
|
2015-08-27 11:14:00 -04:00 |
|
Isaac Connor
|
75919c9cd5
|
Merge branch 'master' into multi-server
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
|
2015-08-27 10:34:47 -04:00 |
Robin Daermann
|
2aca87654a
|
Remove unneccessary parameter in constructor
|
2015-08-26 07:44:50 +02:00 |
|
Andrew Bauer
|
a2d7ac86fe
|
add rtsp_describe to RtspThread class
|
2015-08-21 10:29:54 -05:00 |
|
Robin Daermann
|
5b465194f8
|
Renamed 'Blacken' zone type to 'Privacy'
|
2015-08-20 17:37:59 +02:00 |
|
Robin Daermann
|
fc50b38331
|
collect variable name
|
2015-08-20 16:02:29 +02:00 |
|
Robin Daermann
|
6fc4525784
|
Blacken Zones are now correctly displayed
|
2015-08-20 15:01:07 +02:00 |
|
Robin Daermann
|
8f9ed96585
|
First try to implement blacken areas for monitors
|
2015-08-20 14:20:41 +02:00 |
|
Isaac Connor
|
41637278c9
|
merge master
|
2015-08-19 16:08:12 -04:00 |
|
Isaac Connor
|
12da43afe7
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
|
2015-08-19 14:01:28 -04:00 |
|
Isaac Connor
|
880e77b096
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
|
2015-08-19 13:30:48 -04:00 |
|
Andrew Bauer
|
fe3595bfa1
|
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
|
2015-08-18 20:20:53 -05:00 |
|
Andrew Bauer
|
2600b96f1b
|
fix merge conflict in zm_monitor.cpp
|
2015-08-18 14:19:46 -05:00 |
|
Andrew Bauer
|
68adcc9e67
|
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
|
2015-08-18 14:07:38 -05:00 |
Linwood-F
|
99c8af4a17
|
Bring up to date with master (mostly)
|
2015-08-17 22:52:51 -04:00 |
|
Andrew Bauer
|
59c1b83d4f
|
create embed_exif flag in Monitor class
|
2015-08-16 17:42:12 -05:00 |
|
Isaac Connor
|
c0517b11ae
|
Merge branch 'master' into multi-server
|
2015-08-16 10:52:51 -04:00 |
|
Robin Daermann
|
7f3a07f21b
|
Add label size to monitor options (database and backend part)
This commit bumps version to 1.28.101 because of database schema change
|
2015-08-10 15:35:18 +02:00 |
|
Isaac Connor
|
a36bee3767
|
Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning
Remove shared data warning for purpose query only
|
2015-08-04 10:09:59 -04:00 |
|
Linwood-F
|
546b0dd353
|
Remove shared data warning for purpose query only
|
2015-08-03 20:37:17 -04:00 |
|
Isaac Connor
|
46b9bd5d1c
|
change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined.
|
2015-07-31 10:29:53 -04:00 |
Emmanuel Papin
|
f7cfa1ecd4
|
Fix analysis sample rate calculation
|
2015-07-28 23:07:02 +02:00 |