Commit Graph

6689 Commits

Author SHA1 Message Date
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
SteveGilvarry 5f4441878e Coded_Frame deprecation all examples were no lomger setting AV_PKT_FLAG_KEY, is it on the packet already. 2016-03-03 17:16:06 +11: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
SteveGilvarry 2122d6e443 Fix all the av_picture related deprecations 2016-03-03 01:03:55 +11: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
Isaac Connor c377c96367 add a missing semi colon just for completeness 2016-03-01 12:18:27 -05:00
Isaac Connor 010fcec990 fix setButtonStates. The checkboxes are an array. 2016-03-01 12:17:59 -05:00
Andy Bauer 466f2b2ae3 change multi-server error message text 2016-03-01 11:12:54 -06:00
Isaac Connor 51ef83dd94 split Monitor info columns into a separate group and the events into a separate group 2016-03-01 11:33:25 -05:00
Isaac Connor a407f9a0b7 pretty much finish the conversion 2016-03-01 11:32:38 -05:00
Isaac Connor 0853f26062 convert console table to divs 2016-03-01 10:05:57 -05:00
Isaac Connor e7303ccb08 change styles from table constructs to class constructs 2016-03-01 09:56:57 -05:00
Isaac Connor 0d8c16bb56 move console styles to view/console 2016-03-01 09:56:36 -05: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
SteveGilvarry e70d037895 Start avpicture deprecation 2016-02-27 01:23:20 +11:00
Andrew Bauer c138914edd Merge pull request #1251 from tikismoke/patch-1
Update gettingstarted.rst
2016-02-26 07:03:36 -06:00
SteveGilvarry d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
SteveGilvarry 0277a66700 Remove eyezm from distros and Cmake.
Conflicts:
	distros/debian8/control
2016-02-26 22:41:27 +11:00
SteveGilvarry 4837585601 Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
Conflicts:
	src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
SteveGilvarry 6b169af655 Remove eyezm configdata
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2016-02-26 22:35:24 +11:00
SteveGilvarry 7c7d7b245c Remove the XML skin folder 2016-02-26 22:30:20 +11:00
SteveGilvarry e6d57da0d4 Remove the mobile skin folder 2016-02-26 22:29:41 +11:00