SteveGilvarry
|
24ebc33ea4
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-03-09 20:54:11 +11:00 |
Isaac Connor
|
9647a680f6
|
Merge branch 'add_onvif_deps' into storageareas
|
2016-03-08 16:06:30 -05:00 |
|
Isaac Connor
|
094b041c43
|
There must be spaces before the comma
|
2016-03-08 16:06:16 -05:00 |
|
Isaac Connor
|
f8582ad9b6
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:56:26 -05:00 |
|
Isaac Connor
|
c27387610c
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:56:17 -05:00 |
|
Isaac Connor
|
b0835660b1
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:56:08 -05:00 |
|
Isaac Connor
|
12a277912e
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:56:01 -05:00 |
|
Isaac Connor
|
cf1d475dbb
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:55:56 -05:00 |
|
Isaac Connor
|
b9996b4fc0
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:55:37 -05:00 |
|
Isaac Connor
|
cfbf2cced1
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:55:29 -05:00 |
|
Isaac Connor
|
455c268a0c
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:55:11 -05:00 |
|
Isaac Connor
|
172b687ab3
|
Merge branch 'add_onvif_deps' into storageareas
|
2016-03-07 22:18:39 -05:00 |
|
Isaac Connor
|
97249110a4
|
must still support libgnutls28 for raspbian
|
2016-03-07 22:18:22 -05:00 |
|
Isaac Connor
|
98b3b92bbf
|
Merge branch 'add_onvif_deps' into storageareas
|
2016-03-07 21:54:25 -05:00 |
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 |
|
SteveGilvarry
|
3ce620eb89
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-02-27 19:46:56 +11:00 |
|
Andrew Bauer
|
f332899e87
|
Merge pull request #1310 from SteveGilvarry/feature-h264-videostorage
ffmpeg 3.0 failed to build failures
|
2016-02-26 10:25:29 -06:00 |
|
SteveGilvarry
|
23d437ab47
|
ffmpeg 3.0 API build failure fixes
|
2016-02-27 02:12:22 +11:00 |
|
Andrew Bauer
|
c138914edd
|
Merge pull request #1251 from tikismoke/patch-1
Update gettingstarted.rst
|
2016-02-26 07:03:36 -06:00 |