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

181 Commits

Author SHA1 Message Date
Emmanuel Papin 9e39924095 Fix confict when pulling master 2014-11-29 19:11:22 +01:00
Andrew Bauer e4fa475d87 Merge pull request #588 from ZoneMinder/digest_auth 
Digest auth
 2014-11-29 08:32:08 -06:00
Emmanuel Papin a4c01435d7 Fix confict when pulling master 2014-11-29 03:37:06 +01:00
Emmanuel Papin f901e73dfd libgcrypt20-dev added in Build-Depends 2014-11-25 11:10:12 +01:00
Emmanuel Papin c287f76511 Remove unneeded dependency 2014-11-25 10:45:04 +01:00
Emmanuel Papin 61118142b9 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into debian_dep 2014-11-25 10:29:28 +01:00
Andrew Bauer 4ac699c167 Merge pull request #594 from ndobbs/feature-ndobbs_selinux_rhel6_support 
updated local_zoneminder type extension file
 2014-11-24 17:46:55 -06:00
Nate Dobbs b81f87af69 updated local_zoneminder type extension file to support ZM running on CentOS/RHEL 6.x in SElinux ENFORCING mode 2014-11-24 17:36:47 -05:00
Andrew Bauer 4c353abecd Update zoneminder.cmake.el6.spec 2014-11-24 15:41:09 -06:00
Andrew Bauer 7c75867300 Update zoneminder.cmake.f20.spec 2014-11-24 15:40:45 -06:00
Emmanuel Papin fe5898c014 Deal with all libjpeg* libraries on debian 2014-11-24 22:22:57 +01:00
Isaac Connor c55c9a716c add libgnutls28-dev as an option to libgnutls-dev 
add the other libjpeg*-dev options, any of which should do
 2014-11-24 14:09:57 -05:00
Emmanuel Papin dde1e13f22 Merge branch 'master' into plugin_support 2014-11-21 14:02:12 +01:00
Isaac Connor f954d4b034 add a changelog entry 2014-11-20 11:07:58 -05:00
Emmanuel Papin b5aa7371ad Add a zoneminder development package for debian 2014-11-20 00:04:16 +01:00
Isaac Connor 4f9a2e1689 update Depends to match ubuntu. 2014-11-17 09:17:03 -05:00
Andrew Bauer 2dc73810db Update rpm specfiles to make use of zmeditconfigdata.sh 2014-11-15 12:55:33 -06:00
Cosme Domínguez Díaz 972dedd15a * distros/debian -> Autotools 
* distros/debian_cmake -> CMake
 2014-11-11 22:48:04 +01:00
Cosme Domínguez Díaz 96859e3b11 * Use CMake instead of Autotools. 
* Some lintian love (minor fixes and cosmetic changes...)
* Don't remove database data if we are using a remote MySQL server.
 2014-11-09 14:18:14 +01: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 2f32c3895b Merge branch 'release-1.28' 
Conflicts:
	web/skins/flat/js/skin.js
 2014-10-22 15:10:19 -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 693c4b2e68 Merge branch 'release-1.28' 2014-10-20 16:45:59 -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
Andrew Bauer 408bbbd535 Merge branch 'release-1.28' 2014-10-19 07:44:27 -05:00
Andrew Bauer fcf39fc9fa Update zoneminder.cmake.f20.spec 
Fix path to README file
 2014-10-18 17:36:12 -05:00
Isaac Connor 4fd2230b1d add release 1.28.0 2014-10-17 09:27:54 -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
Andrew Bauer 7dbad45e30 Update README.Fedora 2014-10-12 15:54:54 -05:00
Andrew Bauer f8cf0401ce fedora specfile changes 2014-10-05 10:27:50 -05:00
Andrew Bauer 6aac41b06f Redhat and Fedora distro folder housekeeping 2014-10-05 09:54:29 -05:00
Andrew Bauer 56fd08d6e9 Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR 2014-10-05 09:42:47 -05: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
Andrew Bauer cccd1ee14f Update README.CentOS 
Change README documentation to recommend disabling selinux
 2014-09-11 10:53:11 -05:00
Isaac Connor b8acac5c32 add polkit stuff required by systemd patch 2014-09-07 17:16:35 -04:00
Isaac Connor 60d7f8285c requirements to build on debian 2014-09-05 12:23:38 -04:00
Isaac Connor b5c29f30f4 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-09-05 11:48:44 -04:00
Isaac Connor 576aca029e sync with ubuntu version 2014-09-05 11:47:20 -04:00
Kyle Johnson 4d579e239a Merge pull request #502 from knnniggett/systemd-2 
Initial systemd support.
 2014-09-03 15:59:42 -04:00
Andrew Bauer 19646bd004 Merge pull request #501 from PX03AFK/opensuse 
Minor corrections to README.OpenSuse
 2014-08-27 06:58:04 -05: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
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05:00
David Wilcox bde7fc8476 Minor corrections to README.OpenSuse 
A few typos and a correction to a web link
 2014-08-07 15:31:13 +01:00
Cosme Domínguez Díaz 786f6518fa Allow use webservers other than apache. 2014-08-04 00:23:47 +02:00
Isaac Connor f0437c6ce4 sync to ubuntu version 2014-08-01 13:53:59 -04:00
Isaac Connor f48f2dbf30 update to same as ubuntu 2014-08-01 13:28:04 -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