mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-24 15:58:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,468 Commits 83 Branches 104 Tags
cd8a4adfabee2bbf4abbbf4e3e44f40bdbd2d198
Commit Graph

5468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Bauer
cd8a4adfab replace uname system call with native perl when applicable 2016-02-15 08:43:34 -06:00
Andy Bauer
47eaea78be use units of bytes for total memory 2016-02-13 15:01:22 -06:00
Andy Bauer
ee3f87a2ad additional refinements to zmtelemetry 2016-02-13 14:53:22 -06:00
Andy Bauer
08af88df10 fix compilation errors 2016-02-13 08:54:40 -06:00
Andrew Bauer
87857f5dc1 more debug and warnings 2016-02-12 17:45:08 -06:00
Andrew Bauer
24838a91c9 set kernel, distro, and version for Mac OS 2016-02-12 17:38:00 -06:00
Andrew Bauer
3c48d81edb tweak regex's. add debug 2016-02-12 17:15:04 -06:00
Andrew Bauer
5045da9382 add initial distro determination logic to zmtelemetry 2016-02-12 15:18:45 -06:00
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
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
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
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
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
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
Andrew Bauer
7a98acc868 update changelog to 1.29.0 release 2016-02-03 13:21:10 -06:00
Andrew Bauer
6de2ab504c Explain ZM_SERVER_HOST in multiserver documentation v1.29.0 2016-02-03 12:40:30 -06:00
Andy Bauer
5a8989b168 Minor RPM packaging changes 2016-02-02 11:47:55 -06:00
Sander Alberink
bd3e79015b Fix Dockerfile 
- migrate to Ubuntu Trusty Tahr, which is the latest LTS release
- add a user that is allowed to login via SSH
- Fix apache configuration
 2016-02-01 12:39:43 +01:00
Sander Alberink
baa305c0ed Increase shared memory available in docker to ensure H.264 cameras can work 
Also enable CGI module, as zoneminder needs this for monitors
 2016-02-01 12:35:45 +01:00
Sander Alberink
b99e7b6500 Prepare for new Apache 2.4 behviour in Trusty 2016-02-01 12:34:09 +01:00
Andrew Bauer
a990b23164 Update zoneminder.f22.spec 2016-01-29 21:25:34 -06:00
Andrew Bauer
fa50327420 Update zoneminder.f23.spec 2016-01-29 21:24:50 -06:00
Kyle Johnson
96db6d5f65 Merge pull request #1254 from pliablepixels/1253-zms-quit-cmd 
1253 zms quit cmd.  Fixes #1253
 2016-01-29 08:47:26 -07:00
arjunrc
904f584fcb CMD_QUIT definition 2016-01-29 10:00:02 -05:00
arjunrc
38bca6b95d added CMD_QUIT to kill zms via command 2016-01-29 09:58:57 -05:00
arjunrc
47b2cdbb96 added CMD_QUIT to kill zms via command 2016-01-29 09:58:50 -05:00
Andrew Bauer
f85ed2d5b4 Merge pull request #1252 from ZoneMinder/multi-server 
Add Debug/Info lines reporting multi-server status
 2016-01-28 07:01:39 -06:00
Isaac Connor
f275498790 Add Debug for sql used to load other than local monitors 2016-01-26 21:00:32 -05:00