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

5653 Commits

Author SHA1 Message Date
Andrew Bauer 269e9bd475 Configure Fedora packages for HTTPS 2015-10-03 12:35:22 -05:00
Andrew Bauer a79d0fc502 update README.fedora 2015-10-03 11:04:58 -05:00
Andrew Bauer 9fae2bdf67 symlink README.https into Fedora folder 2015-10-03 10:45:41 -05:00
Isaac Connor 8e75330031 Merge branch 'master' into multi-server 2015-10-02 14:24:24 -04:00
Isaac Connor ac8bfc71dc fix specifying ServerId 2015-10-02 18:22:48 +00:00
Isaac Connor 6570a8d855 fix Server->Hostname() 2015-10-02 18:22:19 +00:00
Isaac Connor da764a605b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-10-02 13:37:56 -04:00
Andrew Bauer 13aab8a1be Merge pull request #1113 from baffo32/1112-detect-missing-content 
Fatal if content dirs are unwritable
 2015-10-14 06:49:33 -05:00
Andrew Bauer ee96793fb3 Merge pull request #1111 from baffo32/1110-fatal-unset-timezone 
Fatal error if date.timezone is unset
 2015-10-14 06:48:51 -05:00
baffo32 da8e9dd81b Remove reference to php.ini from timezone error 2015-10-13 16:55:38 -04:00
baffo32 ec12d448e4 Generalization date.timezone installation step 2015-10-13 16:52:39 -04:00
baffo32 250c3c31e1 Revised source-install specific recommendation. 2015-10-13 16:45:31 -04:00
Andrew Bauer acaa0091b4 Merge pull request #1095 from ZoneMinder/fix_zmaudit 
Fix zmaudit
 2015-10-13 07:22:21 -05:00
Andrew Bauer d6667100b4 Merge pull request #1084 from ZoneMinder/tz 
Tz
 2015-10-13 07:19:45 -05:00
baffo32 362b190641 Fatal if content dirs are unwritable 2015-10-12 16:16:22 -04:00
baffo32 4a280a73d1 Use Fatal function to report bad timezone 2015-10-12 15:43:24 -04:00
baffo32 24454253af Add date.timezone step to INSTALL 2015-10-12 15:25:30 -04:00
baffo32 d20478a15f Detect invalid timezones 2015-10-12 13:22:30 -04:00
baffo32 7190b532dd Fatal error if date.timezone is unset 2015-10-12 13:07:07 -04:00
Andrew Bauer 8f2e073735 Merge pull request #1107 from baffo32/1106-zm-conf-new 
Fix faulty zm.conf.new install line
 2015-10-12 06:53:29 -05:00
baffo32 eecfb80292 Fix faulty zm.conf.new install line 2015-10-11 22:41:57 -04:00
Isaac Connor 79d8e4b74f Merge branch 'master' into fix_zmaudit 2015-10-06 09:30:32 -04:00
Isaac Connor 4a506368dc Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field 2015-10-06 09:30:10 -04:00
Isaac Connor 2be61906a4 add checks for execinfo library 2015-10-02 13:37:50 -04:00
Andrew Bauer 67a5d6b213 Merge pull request #1089 from ZoneMinder/fix_warnings 
change types and move things around to remove compile warnings
 2015-10-02 12:29:09 -05:00
Andrew Bauer 48f6c9b9c8 Merge pull request #1090 from ZoneMinder/no_overwrite_zm_conf 
Don't install zm.conf if it already exists
 2015-10-02 12:09:23 -05:00
Isaac Connor 796bad55a3 install zm.conf as zm.conf.new if zm.conf already exists 2015-10-02 12:54:25 -04:00
Isaac Connor e12640ec73 Merge branch 'no_overwrite_zm_conf' into multi-server 2015-10-02 15:34:14 +00:00
Isaac Connor 6ff4e333b4 Merge branch 'fix_warnings' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-10-02 15:34:05 +00:00
Isaac Connor 00ef849908 fix line testing for Hostname 2015-10-02 15:29:17 +00:00
Isaac Connor 7b253bcd7e Debug line 2015-10-02 15:28:51 +00:00
Isaac Connor fc6a6aeaa3 Don't install zm.conf if it already exists 2015-10-02 11:27:35 -04:00
Isaac Connor 24b79e81bc add include for basename on freebsd 2015-10-02 11:00:42 -04:00
Isaac Connor cf5473836e set default border on live streams so that when they alarm they don't jump around 2015-10-02 10:04:56 -04:00
Isaac Connor 8125ef0334 change types and move things around to remove compile warnings 2015-10-02 09:49:09 -04:00
Isaac Connor aa108eff6e Add Info line on startup saying which Server it is loading for 2015-10-02 12:33:09 +00:00
Isaac Connor b0b69c5176 parse ZM_SERVER_HOST into ZM_SERVER 2015-10-02 12:32:41 +00:00
Isaac Connor 4edf997791 change docroot to /usr/share/zoneminder/www and cgi-bin to /usr/lib/zoneminder/cgi-bin 2015-10-02 12:32:12 +00:00
Isaac Connor ea87ffe66f merge master, bump version to 1.28.108 2015-10-01 11:52:49 -04:00
Isaac Connor c9d7087c91 Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone 2015-10-01 11:47:12 -04:00
Isaac Connor 2d749f0b66 Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone 2015-10-01 11:46:51 -04:00
Pliable Pixels d9355064e7 fixed orange display for monitor mode 2015-10-01 11:35:38 -04:00
Kyle Johnson b2b52a364a Merge pull request #1080 from ZoneMinder/kylejohnson-patch-1 
use deleteAll() vs. delete() when deleting an Event's Frames
 2015-09-30 14:00:16 -06:00
Kyle Johnson 9c7a15daf7 use deleteAll() vs. delete() when deleting an Event's Frames 2015-09-30 13:53:23 -06:00
Andrew Bauer 8d2de77f18 Merge pull request #1079 from bofhdk/SunEyes_sp-p1802swptz 
Added control script for SunEyes SP-P1802SWPTZ
 2015-09-30 07:35:44 -05:00
Bobby Billingsley ef5d62a6c2 typo fixed 2015-09-30 14:10:13 +02:00
Bobby Billingsley a335afb554 added missing MonitorPresets values 2015-09-30 13:59:41 +02:00
Bobby Billingsley 6fe69f3d28 added missing Controls values 2015-09-30 13:55:14 +02:00
Andrew Bauer 33f3cd50f0 Merge pull request #1075 from ZoneMinder/663-frames-primary-key 
663 frames primary key
 2015-09-30 06:50:39 -05:00
Bobby Billingsley 4eb4bdbfb5 Added control script for SunEyes SP-P1802SWPTZ 
(http://www.amazon.com/SunEyes-SP-P1802SWPTZ-Wireless-Camera-1080P/dp/B00MOTBXK6)
 2015-09-30 13:39:50 +02:00