Isaac Connor
|
ef9f218c77
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-03-07 21:52:42 -05:00 |
|
Isaac Connor
|
0e8fc7953d
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-03-07 21:46:10 -05:00 |
Isaac Connor
|
30ffae5bc1
|
Merge branch 'master' into storageareas
|
2016-03-07 21:42:06 -05:00 |
|
Isaac Connor
|
9abcdc76c6
|
Merge branch 'master' into add_onvif_deps
|
2016-03-07 21:27:47 -05:00 |
Andy Bauer
|
ab3c35c629
|
fix missing Net::SFTP::Foreign::debug warning
|
2016-03-04 17:21:32 -06:00 |
|
Isaac Connor
|
b06b82f634
|
widen filter popup, because storage area name or server name might be longer
|
2016-03-04 15:35:55 -05:00 |
Andrew Bauer
|
de85e18829
|
rpm specfile changes for 1.30.0
|
2016-03-03 08:33:49 -06:00 |
|
Isaac Connor
|
86dbe4fa15
|
define default for StorageId to prevent error message
|
2016-03-03 09:22:53 -05:00 |
|
Isaac Connor
|
bcb403bf08
|
Merge branch 'fix_setButtonStates' into storageareas
|
2016-03-03 09:08:37 -05:00 |
|
Isaac Connor
|
c0ed40fd06
|
fix structure of if/for
|
2016-03-03 09:06:57 -05:00 |
|
Isaac Connor
|
3340f9e375
|
split into multiple lines and add onvif deps
|
2016-03-03 09:01:26 -05:00 |
|
Isaac Connor
|
5e617753e5
|
split into multiple lines and add onvif deps
|
2016-03-03 09:01:15 -05:00 |
|
Isaac Connor
|
4f4e65f86c
|
split into multiple lines and add onvif deps
|
2016-03-03 09:00:08 -05:00 |
|
Isaac Connor
|
3c9173fa5c
|
split into multiple lines and add onvif deps
|
2016-03-03 08:59:11 -05:00 |
|
Isaac Connor
|
41db18a8c6
|
split into multiple lines and add onvif deps
|
2016-03-03 08:59:03 -05:00 |
|
Isaac Connor
|
61ffae79d1
|
split into multiple lines and add onvif deps
|
2016-03-03 08:58:53 -05:00 |
|
Andrew Bauer
|
8382e4aa81
|
Merge pull request #1319 from ZoneMinder/SHA1_to_SHA
use Digest::SHA instead of Digest::SHA1. API appears to be the same
|
2016-03-02 14:54:54 -06:00 |
|
Isaac Connor
|
d4ed493333
|
add onvif dependencies and cleanup build-depends
|
2016-03-02 10:56:07 -05:00 |
|
Isaac Connor
|
7d346747d6
|
use Digest::SHA instead of Digest::SHA1. API appears to be the same
|
2016-03-02 10:18:58 -05:00 |
|
Isaac Connor
|
cedc46adf3
|
Merge branch 'fix_setButtonStates' into storageareas
|
2016-03-02 09:12:19 -05:00 |
|
Isaac Connor
|
0d8c63f578
|
Merge branch 'master' into storageareas
|
2016-03-02 09:11:55 -05:00 |
Isaac Connor
|
0a5d7a11b2
|
Merge pull request #1316 from knnniggett/multiservermsg
change multi-server error message text
|
2016-03-01 12:25:09 -05:00 |
|
Isaac Connor
|
bb0dcf3d43
|
fix setButtonStates. The checkboxes are an array.
|
2016-03-01 12:19:46 -05:00 |
|
Andy Bauer
|
466f2b2ae3
|
change multi-server error message text
|
2016-03-01 11:12:54 -06:00 |
|
Isaac Connor
|
838da183e0
|
Merge pull request #1314 from knnniggett/zm.conf
add comment/warning for ZM_SERVER_HOST
|
2016-03-01 09:55:06 -05:00 |
|
Andy Bauer
|
1c9633f1bd
|
add comment/warning for ZM_SERVER_HOST
|
2016-03-01 08:43:36 -06:00 |
Kyle Johnson
|
bc89b95470
|
Merge pull request #1292 from ZoneMinder/telemetry
Telemetry Data
|
2016-03-01 07:17:16 -07:00 |
|
Andy Bauer
|
b7259b973a
|
first formatting pass
|
2016-02-28 12:54:21 -06:00 |
|
Andy Bauer
|
72c8ae3735
|
Remove package building instructions from README.md
|
2016-02-28 12:32:45 -06:00 |
|
Andy Bauer
|
35d013136f
|
add redhat instructions to readthe docs
|
2016-02-28 12:27:04 -06:00 |
|
Andrew Bauer
|
6aabfa71f5
|
Merge pull request #1311 from pliablepixels/image-php-typo
typo in function name
|
2016-02-27 12:56:00 -06:00 |
arjunrc
|
84801fcb86
|
typo in function name
|
2016-02-27 13:06:33 -05:00 |
|
Andrew Bauer
|
c138914edd
|
Merge pull request #1251 from tikismoke/patch-1
Update gettingstarted.rst
|
2016-02-26 07:03:36 -06:00 |
|
Isaac Connor
|
86c223668d
|
Merge branch 'master' into storageareas
|
2016-02-25 19:11:38 -05:00 |
|
Andrew Bauer
|
f0a4ef8b70
|
Merge pull request #1306 from SteveGilvarry/cake2.8
Update to CakePHP 2.8.0 copy in lib folder
|
2016-02-25 15:09:15 -06:00 |
|
Isaac Connor
|
1ff4c65339
|
Merge pull request #1305 from knnniggett/netcat
add Netcat ONVIF compatible ptz control
|
2016-02-25 09:23:57 -05:00 |
SteveGilvarry
|
b294f210dc
|
Update to CakePHP 2.8.0 copy in lib folder
|
2016-02-25 23:25:24 +11:00 |
|
Andy Bauer
|
7a42a8c3f9
|
add Netcat ONVIF compatible ptz control
|
2016-02-24 10:15:59 -06:00 |
|
Isaac Connor
|
28e94764d7
|
Merge pull request #1304 from knnniggett/debianscript
use debian control file to auto-install deps
|
2016-02-22 19:20:06 -05:00 |
|
Andrew Bauer
|
2fc1fc4380
|
use debian control file to auto-install deps
|
2016-02-22 09:18:46 -06:00 |
|
Andrew Bauer
|
918407bcae
|
Merge pull request #1248 from pliablepixels/documentation
updated documentation for ubuntu
|
2016-02-22 09:05:53 -06:00 |
|
Isaac Connor
|
e12152602b
|
t push origin masterMerge branch 'knnniggett-zmtrigger2' into storageareas
|
2016-02-22 09:15:45 -05:00 |
|
Isaac Connor
|
90dd078c22
|
bump release
|
2016-02-22 09:14:57 -05:00 |
|
Andrew Bauer
|
0fce33b2d3
|
one too many curly brackets
|
2016-02-22 06:59:14 -06:00 |
|
Andy Bauer
|
a2e06ed70c
|
Prevent zmtrigger from crashing when memory handles change
|
2016-02-21 17:55:04 -06:00 |
|
Isaac Connor
|
b653f74b09
|
Merge pull request #1301 from kunkku/event-memcpy-overlap
zm_event: fix overlap in memcpy buffers
|
2016-02-20 20:43:24 -05:00 |
Kaarle Ritvanen
|
5b047dc74b
|
zm_event: fix overlap in memcpy buffers
|
2016-02-20 23:58:36 +02:00 |
|
Andrew Bauer
|
82a130bf58
|
Merge pull request #1300 from ZoneMinder/zm_trigger_improvements
Zm trigger improvements
|
2016-02-19 11:50:54 -06:00 |
|
Isaac Connor
|
131d0daefe
|
fix syntax
|
2016-02-19 11:47:18 -05:00 |
|
Isaac Connor
|
66e76e4c2e
|
Merge branch 'zm_trigger_improvements' into storageareas
|
2016-02-19 11:09:41 -05:00 |