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

6402 Commits

Author SHA1 Message Date
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
Isaac Connor 08858685c5 add find_all function to Storage 2016-02-03 09:43:02 -05:00
Isaac Connor 555904c588 Add Storage column to console 2016-02-03 09:42:50 -05:00
Andy Bauer 5a8989b168 Minor RPM packaging changes 2016-02-02 11:47:55 -06:00
Isaac Connor 48283191ec Merge branch 'master' into storageareas 2016-02-01 15:47:08 -05:00
Isaac Connor f46b10d399 bump release 2016-02-01 15:46:45 -05:00
Isaac Connor cc2c1405ed include Event.php 2016-02-01 14:59:06 -05:00
Isaac Connor 4e9e01836f Use Event->Path instead of ZM_DIR_EVENTS 2016-02-01 13:41:57 -05:00
Isaac Connor 9543a8a364 Add Event.php to autoconf build 2016-02-01 13:08:48 -05:00
Isaac Connor 11b206e281 fix getPath -> Path 2016-02-01 12:52:14 -05:00
Isaac Connor ff46344175 Use Storage Areas in geteventPath 2016-02-01 12:51:43 -05: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
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11: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
tikismoke f7bc8c7f0d Update gettingstarted.rst 
Correct MODECT by NODECT if using zmTrigger
 2016-01-26 20:14:49 +01: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
arjunrc 680ab0236c updated ubuntu instructions 2016-01-24 07:47:25 -05: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
arjunrc 0ef6d55e8f resolves #1231 - ubuntu package from source instructions added 2016-01-22 09:39:19 -05: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 ebbecd5cc4 add php5-gd to depends. We use it for image scaling 2016-01-14 13:41:09 -05:00
Isaac Connor baa805ae60 alternatively, accept and eid and fid to specify the frame 2016-01-14 13:35:30 -05:00
Isaac Connor e057d8d722 rough in an Event object. 2016-01-14 13:34:51 -05:00