ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,443 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

5443 Commits

Author SHA1 Message Date
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 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
Isaac Connor 902065a6c1 Add Debug for sql used to load local monitors 2016-01-26 20:59:07 -05:00
Isaac Connor 3a0b28f168 Add Debug/Info lines reporting multi-server status 2016-01-26 20:53:34 -05:00
Andy Bauer fa168027b3 Fix PelcoP checksum calculation 2016-01-24 07:45:04 -06:00
Andrew Bauer 50b113cd02 Merge pull request #1189 from marcolino7/master 
PTZ - Added autostop to Down command on FI8918W
 2016-01-24 07:40:30 -06:00
Andrew Bauer 2f80f26f92 Merge pull request #1232 from ZoneMinder/remove_google_fonts 
remove Google open Sans external import
 2016-01-23 10:24:49 -06:00
Brandon Odegard 54a11175ff Reduce default size of body font in Flat skin 2016-01-22 13:56:41 -06:00
Brandon Odegard 1ca9ace84d Fixed missing semicolons 2016-01-22 13:31:02 -06:00
Brandon Odegard 9c72579c2e Corrected typo in function info 2016-01-22 12:12:39 -06:00
Brandon Odegard 029c1efa31 Corrected update version comment to 1.28.110 
Corrected version comment to indicate database update from 1.28.109 to 1.28.110
 2016-01-22 10:48:47 -06:00
Brandon Odegard 8753ee98e5 Corrected update version comment to 1.28.109 
Corrected version comment to indicate an update from 1.28.108 to 1.28.109
 2016-01-22 10:46:46 -06:00
Isaac Connor b2c311c306 Merge pull request #1244 from pliablepixels/do_debian_package-mods 
Do debian package mods
 2016-01-22 09:02:14 -05:00
Pliable Pixels 0ade8abd6a typo 2016-01-20 16:11:35 -05:00
Pliable Pixels 8dd35d6057 modifications for general users 2016-01-20 16:09:12 -05:00
Andy Bauer 22ef473202 Use the full name 2016-01-19 10:22:51 -06:00
Andy Bauer a17bde0784 update hostname logic 2016-01-19 10:13:36 -06:00
Andy Bauer e2b00bbe1f use local user @ hostname.local for author 2016-01-19 08:05:40 -06:00
Isaac Connor 25eba33adb Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-01-18 21:39:36 -05:00
Isaac Connor e9c9caf201 Add a local build type 2016-01-18 21:39:33 -05:00
Isaac Connor 74c0d40b19 Merge pull request #1240 from knnniggett/zmtrigger 
zmtrigger - process off+time delay condition
 2016-01-18 10:37:26 -05:00
Andy Bauer 66c66106f5 Process off+time delay condition 2016-01-15 20:31:31 -06:00
Isaac Connor 4520902dd2 use trim on values when saving. 2016-01-14 09:37:41 -05:00
Isaac Connor 3ebeaec8ab Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-01-10 20:59:01 -05:00
Isaac Connor 47d4331d62 Add Hostname Column to create script, to match update 2016-01-10 20:58:45 -05:00
Isaac Connor 2d86e7713d increase height of logout popup to fit content 2016-01-08 12:14:01 -05:00
Andrew Bauer 7e4a12e7f7 Merge pull request #1233 from ZoneMinder/multi-server 
Multi server
 2016-01-08 10:11:49 -06:00