Commit Graph

6129 Commits

Author SHA1 Message Date
Andrew Bauer c892e912cf use uname -p for telemetry architecture 2016-02-12 10:47:12 -06:00
Andrew Bauer b04e1eb0c6 let mysql generate the uuid 2016-02-12 09:18:15 -06:00
Andrew Bauer 799437fdf1 retrieve telemetry data from the monitors table 2016-02-12 08:59:16 -06:00
Andrew Bauer 017417d8f8 small changes to zmtelemetry 2016-02-12 08:06:51 -06:00
Isaac Connor f9b3287539 Merge pull request #1283 from pliablepixels/1282-multiserver-debug-demote
demoted to debug due to lots of logs
2016-02-11 17:08:56 -05:00
arjunrc e8c38dd016 demoted to debug due to lots of logs 2016-02-11 15:12:21 -05:00
Andrew Bauer 1b6af8afae modify telemetry parameters 2016-02-11 13:10:36 -06:00
Andrew Bauer 1811d71562 make date format compatible with *BSD 2016-02-11 08:10:16 -06:00
Andrew Bauer f5ff5d152c Add count query subroutine 2016-02-11 07:22:31 -06:00
Robin Daermann b28224cacb Added copyright information to mk_bigfont.pl 2016-02-11 07:35:21 +01:00
Andy Bauer 6d81ef247e build telemetry hash then jsonencode it 2016-02-10 20:46:05 -06:00
Andrew Bauer 177a70a248 add getIP subroutine to zmtelemetry.pl 2016-02-10 14:05:34 -06:00
Andrew Bauer f48ffb60e6 update ZM_TELEMETRY_UUID after creating uuid 2016-02-10 13:37:22 -06:00
Andrew Bauer 18c493a180 Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD 2016-02-10 13:04:14 -06:00
Andrew Bauer 51a4298fc7 Merge pull request #1280 from altaroca/1272-onvif-copyright
1272 onvif copyright
2016-02-10 12:03:08 -06:00
Jan M. Hochstein 61932a6470 Corrected file copyrights 2016-02-10 16:36:21 +01:00
Jan M. Hochstein ee48c830d0 Added README and removed WSDL files in onvif folder 2016-02-10 16:25:23 +01:00
Jan M. Hochstein 2b9693748b Added README and removed WSDL files in onvif folder 2016-02-10 16:22:34 +01:00
Robin Daermann 226b77bb63 Added script to generate src/zm_bigfont.h
Also added a line to the header of src/zm_bigfont.h on how it is
generated.
2016-02-10 11:28:56 +01:00
Andrew Bauer 7a9740b1a4 Update zmtelemetry.pl.in 2016-02-09 14:35:45 -06:00
Kyle Johnson 609784f902 Update telemetry host, port and protocol 2016-02-09 12:49:09 -07:00
Andy Bauer cb1514193f Merge branch 'schrorg-vivotek-ePTZ' 2016-02-09 06:57:05 -06:00
Andy Bauer b718bd298f Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ 2016-02-09 06:56:38 -06:00
Andrew Bauer 0b2a309014 Merge pull request #961 from Linwood-F/960-montage-review-new-feature
960 montage review new feature
2016-02-08 20:40:04 -06:00
Andrew Bauer 308d98955e By default, enable ONVIF discovery support 2016-02-08 14:05:06 -06:00
Isaac Connor a2ae29dfbe Add php5-gd to depends 2016-02-08 09:47:52 -05:00
Isaac Connor a5c1533ab1 Merge pull request #1266 from onlyjob/codespell
codespell: misc. spelling corrections
2016-02-08 09:36:44 -05:00
Dmitry Smirnov 0f63f4357d sphinx: fix warning "Title underline too short".
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 21:06:21 +11:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
Andrew Bauer f607e3a6fa zmtelemetry - the typo of my typo is my friend 2016-02-06 14:50:02 -06:00
Andrew Bauer 4ad31695ba fix typo in cmakefile 2016-02-06 14:25:00 -06:00
Andrew Bauer e0ee05e05c add zmtelemetry to cmake 2016-02-06 14:10:42 -06:00
Andrew Bauer 8a537029ea Initial commit to add zmtelemetry.pl 2016-02-06 14:08:28 -06:00
Andrew Bauer 41acdbb480 Merge pull request #1257 from salberin/topic/docker-fixes
Fix docker file
2016-02-05 07:37:38 -06:00
Sander Alberink e01547cbe4 Update timezone to GMT, reduce SHM requirement to 512M
Increase the SHM to 2048 if you need to support H.264 cameras
2016-02-05 14:08:43 +01:00
Sander Alberink b0c5aa511a Migrate to cmake for building.
Also ensure that content is properly symlinked.
2016-02-05 14:02:20 +01:00
Isaac Connor 9ace6c518d Merge pull request #1225 from Simpler1/profiles
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-02-04 11:55:48 -05:00
Isaac Connor dd4f92fd4c Merge pull request #1243 from knnniggett/do_debian_script
use local user @ hostname.local for author
2016-02-04 11:55:14 -05:00
Isaac Connor d3755611c5 Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
2016-02-04 11:54:02 -05:00
Isaac Connor 52e16dbdd0 Merge pull request #1249 from knnniggett/pelcop
Fix PelcoP checksum calculation
2016-02-04 11:52:51 -05:00
Andrew Bauer ab7b4ab3e6 Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated
implement Width and Height functions, and test for image rotation and…
2016-02-04 10:17:19 -06:00
Andrew Bauer 1c142a48a6 Merge pull request #1212 from RBxx/patch-1
Convert ru_ru.php to UTF-8
2016-02-04 10:16:24 -06:00
Andrew Bauer 748754a213 Merge pull request #1209 from adamreiser/StrictKeyChecking
Strict key checking
2016-02-04 10:07:19 -06:00
SteveGilvarry 0e449dc54f Merge branch 'video_remote' of https://github.com/SteveGilvarry/ZoneMinder into video_remote 2016-02-05 01:49:57 +11:00
SteveGilvarry fa7ec2179d Bring is more of the h264 code and add some master changes to the duplicated code 2016-02-05 01:47:13 +11:00
SteveGilvarry 64bc7398fc Fixes for remote h264 passthrough 2016-02-05 01:47:13 +11:00
SteveGilvarry 78b0a9d0a9 Add videostore to remote_rtsp, still need to check stream is h264 2016-02-05 01:47:12 +11:00
Andrew Bauer cbe88d0a3f Merge pull request #1239 from ZoneMinder/trim_when_saving
use trim on values when saving.
2016-02-04 08:29:02 -06:00
SteveGilvarry e76d5ad1cb Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-04 07:33:40 +11:00
Andrew Bauer 7a98acc868 update changelog to 1.29.0 release 2016-02-03 13:21:10 -06:00