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

56 Commits

Author SHA1 Message Date
Isaac Connor abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Isaac Connor b81395843c fix spacing in control file 2016-03-30 10:56:10 -04:00
Isaac Connor f8582ad9b6 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:56:26 -05:00
Isaac Connor 4f4e65f86c split into multiple lines and add onvif deps 2016-03-03 09:00:08 -05:00
SteveGilvarry 1ff2043774 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-12-23 19:24:08 +11:00
Isaac Connor 9743bad13f Add a valid config if a person is using mod_fcgid instead of mod_php 2015-12-20 12:21:18 -05:00
SteveGilvarry d45cf9607b Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-10-28 08:12:46 +11:00
Isaac Connor e37cf0e218 append /www to docroot for all debian/ubuntu dists 2015-10-23 16:08:32 -04:00
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
 2015-10-23 22:07:22 +11: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
Isaac Connor 1e60fccd81 Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0 
Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog
 2015-07-28 21:39:47 +10:00
Isaac Connor 424b7d50bd php-gd should isntead be php5-gd 2015-07-16 13:59:06 -04:00
Isaac Connor e3042c59a5 add php-gd to list of dependencies for debian and ubuntu builds 2015-07-16 13:40:16 -04:00
Isaac Connor 7a08127d21 release snapshot 2015071501 2015-07-15 12:02:20 -04:00
Isaac Connor 75cfc3f0cd bump release 2015-03-02 17:16:00 -05:00
Isaac Connor 098e66951e remove netpbm from debian packaging 2015-03-02 17:15:27 -05:00
Isaac Connor cdb5180964 bump snapshot release 2015-02-13 13:14:50 -05:00
Isaac Connor eb73c16246 add mysql-client-5.6 as an option in depends 2015-02-13 13:06:03 -05:00
Isaac Connor 51bd39c7f6 already done in master 2015-01-03 13:59:54 -05:00
Isaac Connor b921b6f254 the debian packaging has this, and apparently we need it to build 2014-12-17 16:23:04 -05:00
Isaac Connor 5dd1b6a388 this is in debian 2014-12-17 16:11:26 -05:00
Isaac Connor 9b860fb08c libjpeg updates to match debian 2014-12-17 16:10:54 -05:00
Isaac Connor 67fc4c5ea9 update to what has been done in debian 2014-12-17 15:43:32 -05:00
Isaac Connor e9e6d84c7b bump release # 2014-12-17 15:30:20 -05:00
Isaac Connor f954d4b034 add a changelog entry 2014-11-20 11:07:58 -05:00
Isaac Connor 60ea505139 add avdevice55 as a dependcy instead of 53, which we need for utopic 2014-10-31 14:11:34 -04:00
Isaac Connor e23c756ca4 Revert "replace uri_encode with uri_escape" 
This reverts commit ce5396f4ea.
 2014-10-21 15:17:34 -04:00
Isaac Connor ce5396f4ea replace uri_encode with uri_escape 2014-10-21 09:47:31 -04:00
Isaac Connor c4394c3c92 add liburi-encode-perl to dependencies, we use it in M8640, will likely use it elsewhere 2014-10-20 16:45:15 -04:00
Isaac Connor 61ebb56424 add 1.28.0 release 2014-10-17 09:26:59 -04:00
Isaac Connor 525d4110da bump snapshot # 2014-10-15 13:14:36 -04:00
Isaac Connor fa44376291 Todays snapshot 2014-09-26 14:45:23 -04:00
Isaac Connor af536624ce add libmime-tools-perl which provides MIME::Entity which is required for email sending 2014-09-26 09:10:26 -04:00
Isaac Connor b8acac5c32 add polkit stuff required by systemd patch 2014-09-07 17:16:35 -04:00
Isaac Connor 5bc7242582 spaces vs tabs are important in rules, debian is more picky than ubuntu 
fix placement of an if to prevent accessing unmapped mem_ptr
 2014-08-19 09:11:49 -04:00
Isaac Connor 2087780ec1 tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set 2014-07-29 14:43:13 -04:00
Isaac Connor b2f1c2fe68 Merge branch 'v4l_to_monitor' 2014-07-24 14:35:23 -04:00
Isaac Connor 6d2be734d2 add mariadb as a dependency option 2014-07-24 11:24:57 -04:00
Isaac Connor 864f68197d change mysql-server to Recommends 2014-07-15 14:06:32 -04:00
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Isaac Connor f33b127e7e add curl dependencies 2014-07-11 10:51:12 -04:00
Isaac Connor e2987067f4 add avtools instead of ffmpg 2014-06-26 13:09:52 -04:00
Isaac Connor 0f4e9eb3e4 add these dependencies, apparently they are required for sftp upload 2014-06-17 10:54:42 -04:00
Isaac Connor a73e367d5e add libav-tools as an option instead of ffmpeg 2014-06-04 11:21:43 -04:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO' 
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
 2014-03-20 16:48:03 -04:00
nkwood 942b9c65da Update init.d 2013-12-23 15:01:21 -06:00
Isaac Connor 7064141161 check for mysql existence first. 2013-12-17 13:13:45 -05:00
Isaac Connor 73dbe81064 update to 1.26.5 2013-12-13 13:45:55 -05:00
Isaac Connor 4555a8bf92 Merge pull request #240 from ZoneMinder/postinstcleanup 
remove extra stuff that I don't think we need because we are the source.
 2013-11-19 08:29:51 -08:00
Isaac Connor c840f1b622 suggest mysql-server 2013-11-08 12:08:06 -05:00