Isaac Connor
|
74301b3ff3
|
Add the dependencies for libmp4v2
|
2016-03-31 11:53:36 -04:00 |
|
Isaac Connor
|
aa516dd575
|
undo the multi-line
|
2016-03-31 11:24:27 -04:00 |
|
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |
Laercio Motta
|
ad912a6c6b
|
Improve test multiserver restart camera. (FIX)
Check if the server is correctly before restart cam and multiserver is activate.
|
2016-03-31 09:45:13 -03:00 |
|
Laercio Motta
|
2f27818e5b
|
Improve test multiserver restart cam.
Test if correct server from camera edit settings.
|
2016-03-31 09:23:01 -03:00 |
|
Isaac Connor
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -04:00 |
|
Isaac Connor
|
89e70b324d
|
add boostrap
|
2016-03-30 14:28:27 -04:00 |
|
Isaac Connor
|
55e237fd3f
|
tabs to spaces, add back perl modules to Builds-Depends
|
2016-03-30 11:10:54 -04:00 |
|
Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
|
Isaac Connor
|
e9c65785e8
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-03-30 10:56:53 -04:00 |
|
Isaac Connor
|
e9ed046361
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-03-30 10:56:32 -04:00 |
|
Isaac Connor
|
b81395843c
|
fix spacing in control file
|
2016-03-30 10:56:10 -04:00 |
Isaac Connor
|
247cb3d0b2
|
Merge pull request #1360 from schrorg/monitornames-spaces
Allow spaces in monitor names
|
2016-03-30 09:17:57 -04:00 |
Isaac Connor
|
204a128ecc
|
fix use of connected when it should be mem_ptr
|
2016-03-29 15:46:47 -04:00 |
|
Isaac Connor
|
50f9241c14
|
When no Id is specified, default to ZM_DIR_EVENTS
|
2016-03-29 15:38:53 -04:00 |
|
Isaac Connor
|
1b69299c2d
|
Include Monitor object so it can be used elsewhere
|
2016-03-29 14:36:42 -04:00 |
|
Isaac Connor
|
1262e831ac
|
rework zmu to load data from the last event with frames when it can't connect to zmc
|
2016-03-29 14:36:16 -04:00 |
|
Isaac Connor
|
0ab6e27259
|
Use Monitor object
|
2016-03-29 14:35:12 -04:00 |
|
Isaac Connor
|
22554603b1
|
remove duplicate zmtelemetry.pl entry
|
2016-03-29 12:31:27 -04:00 |
|
Isaac Connor
|
cfa11b95dc
|
Add missing Server and Storage Area filters
|
2016-03-29 12:27:23 -04:00 |
|
Isaac Connor
|
d91045319d
|
Use Event object delete method in deleteEvent
|
2016-03-29 12:07:13 -04:00 |
|
Isaac Connor
|
c309cdaad4
|
include Event object so it can be used elsewhere
|
2016-03-29 12:06:51 -04:00 |
|
Isaac Connor
|
f0a307e082
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
Conflicts:
distros/ubuntu1504_cmake/control
|
2016-03-29 11:53:17 -04:00 |
|
Isaac Connor
|
1ea1852476
|
Do some Storage Areas support
|
2016-03-29 11:52:25 -04:00 |
|
Isaac Connor
|
58f19f14e1
|
print ip and hostname when can't connect
|
2016-03-29 11:51:58 -04:00 |
|
Isaac Connor
|
34c50b8cfc
|
ipv6 support
|
2016-03-29 11:51:28 -04:00 |
|
Isaac Connor
|
e3564f6a63
|
add zmtelemtry.pl
|
2016-03-29 11:51:03 -04:00 |
|
Isaac Connor
|
e4d0f2ffda
|
fixup depends
|
2016-03-29 11:50:51 -04:00 |
|
Isaac Connor
|
3cb7687789
|
add zmtelemetry.pl to autotools build
|
2016-03-29 11:50:25 -04:00 |
|
Isaac Connor
|
655116eea9
|
add LinkPath and delete methods
|
2016-03-29 11:49:15 -04:00 |
|
Isaac Connor
|
7f34a0df37
|
Remove deprecated --enable-crashtrace
|
2016-03-29 11:48:30 -04:00 |
Robin Daermann
|
c8c0586c66
|
Trim monitor names
|
2016-03-29 11:40:14 +02:00 |
|
Isaac Connor
|
9a8a08bd83
|
Merge pull request #1368 from knnniggett/onvifresult
remove $result from onvif error message
|
2016-03-28 14:06:40 -04:00 |
Andrew Bauer
|
2365c2156f
|
remove $result from onvif error message
|
2016-03-28 09:53:57 -05:00 |
Andrew Bauer
|
ab05d52a0a
|
Update en_gb.php
typo
|
2016-03-28 08:35:34 -05:00 |
|
Andrew Bauer
|
ffc0ebaf22
|
Merge pull request #1361 from ZoneMinder/fix_coverity_issues
Fix coverity issues
|
2016-03-26 21:11:28 -05:00 |
|
Isaac Connor
|
e717349116
|
Merge pull request #1364 from knnniggett/onvif_maxfps
do not set maxfps fields during onvif probe
|
2016-03-26 15:34:54 -04:00 |
|
Andy Bauer
|
6eda3eff72
|
do not set maxfps fields during onvif probe
|
2016-03-26 08:38:28 -05:00 |
|
Andrew Bauer
|
a3e79e5119
|
Merge pull request #1362 from czettnersandor/master
Minor grammar fixes
|
2016-03-25 08:38:06 -05:00 |
Sándor Czettner
|
38e3c92546
|
Minor grammar fixes
|
2016-03-25 13:18:43 +00:00 |
|
Andrew Bauer
|
d412e8dc5c
|
Update redhat.rst
|
2016-03-25 07:54:37 -05:00 |
Kyle Johnson
|
664e0be6f9
|
Merge pull request #1356 from violuke/patch-1
Minor improvements to ubuntu documentation
|
2016-03-24 09:22:57 -06:00 |
Luke Cousins
|
0e54831072
|
Swapping back to vi as default editor
|
2016-03-24 15:15:58 +00:00 |
|
Isaac Connor
|
a16c1746e5
|
separate a failure to open versus failure to lock. Quiets coverity because close can't handle a negative value
|
2016-03-24 10:00:02 -04:00 |
|
Robin Daermann
|
af68fd20a8
|
Some Translations for Monitor names with spaces
|
2016-03-24 14:51:24 +01:00 |
|
Isaac Connor
|
1e52a8ad2c
|
remove unused class member
|
2016-03-24 09:44:34 -04:00 |
|
Isaac Connor
|
b6ee4e4228
|
move return up into #ifdef.
|
2016-03-24 09:43:15 -04:00 |
|
Isaac Connor
|
0c32ae61ef
|
Merge branch 'master' into fix_coverity_issues
|
2016-03-24 09:42:01 -04:00 |
|
Robin Daermann
|
71db9b84e6
|
Allow spaces in monitor names
|
2016-03-24 14:37:24 +01:00 |
|
Andrew Bauer
|
2deeb6bebf
|
Merge pull request #1339 from mnoorenberghe/readme-rtd
Change README documentation link to readthedocs
|
2016-03-23 16:46:43 -05:00 |