Commit Graph

7702 Commits

Author SHA1 Message Date
MalakymR de6f8de3f8 Include Gentoo ebuild (#1993)
package: https://packages.gentoo.org/packages/www-misc/zoneminder
wiki: https://wiki.gentoo.org/wiki/ZoneMinder

Currently at 1.30.2, PR pending for .4
Will be a -9999 ebuild to track git soon as well.
2017-10-04 07:41:44 -04:00
Andrew Bauer aa25936b3d Merge pull request #1991 from ZoneMinder/UserLanguageFix
Fix user language setting never being used
2017-09-29 12:20:03 -05:00
Steve Gilvarry 9c40f65757 Fix user language setting never being used
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858675 pointed here
https://forums.zoneminder.com/viewtopic.php?t=19403
Checked and sure enough was still there not pointing to the lang folder.
2017-09-29 11:20:20 +10:00
Steve Gilvarry d83b9ce622 Fixes #1983 (#1989)
Fair point here we put a command it should run, but I have added assistance with this part of the install is not zoneminder specific
2017-09-28 18:03:39 -04:00
DeathByKorea 6cbab6e68b Added Arch AUR package (#1986)
Package is well maintained, [Arch Wiki page](https://wiki.archlinux.org/index.php/ZoneMinder)
2017-09-23 13:46:40 -04:00
Isaac Connor 9ad29f4baf fix and move pod to bottom 2017-09-11 22:19:49 -04:00
Isaac Connor 5516a62a0e google code style, switch quotes 2017-09-11 22:12:10 -04:00
Isaac Connor 104bf07c5a fix pod docs 2017-09-11 21:52:22 -04:00
Isaac Connor 54b8cce5e4 fix tabs to spaces 2017-09-11 16:57:51 -04:00
Andrew Bauer 496ba70819 remove checks for empty and just check for true (#1980)
Yeah I agree.  I think the exists was from pre-object method days.
2017-09-11 13:27:17 -04:00
ralimi 58a9107675 Fix incorrect links to transparent.png and index.php (#1982)
* Fix install location for config files when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Omitted README file that should have appeared in /etc/zm/conf.d

* Fix location for configs when building to alternate directory.

* Fix works, but this should go on a branch instead.

* Fix works, but this should go on a branch instead.

* Fix location for configs when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Remove double quotes. This is a list of paths.

* Allow SSL database connection to be secured with SSL.

* Fix incorrect variable name

* Fix PHP syntax errors

* SSL connection parameters must also be passed in API.

* Fix links pointing at transparent.gif

* Use relative path to index.php instead of absolute.

The installation may not be rooted at / on the server.
2017-09-10 11:49:53 -04:00
Andrew Bauer ab4eb14127 Update .travis.yml
arm containers require arm architecture.
2017-09-04 20:12:12 -05:00
Andrew Bauer 9021d1203d Update .travis.yml
we can now build fedora 25 armhfp rpms using the container I built and hosted on hub.docker.com
2017-09-04 19:39:09 -05:00
Andrew Bauer b56aafb16d Update .travis.yml
we can now build fedora 26 armhfp rpms using the container I built and hosted on hub.docker.com
2017-09-04 17:41:11 -05:00
Andrew Bauer 553482ab0d Merge pull request #1975 from senden9/patch-1
Add zip package to the docker image. Fix #1974
2017-08-30 07:46:35 -05:00
Stefano Probst 35c23f5fcf Add zip package to the docker image. Fix #1974
Otherwise no export of a event as ZIP file is possible.
2017-08-26 17:16:17 +02:00
Andrew Bauer a8cf384be9 rpm spcfile change
use %{_buildshell} macro rather than hard code path to shell interpreter
2017-08-23 08:48:11 -05:00
Isaac Connor d406d9549c use int instead of unsigned int. Google code style says it's right, and it gets rid of a comparison warning 2017-08-22 09:47:30 -04:00
Andrew Bauer 160641563f packpack - add missing $parms var 2017-08-21 18:50:30 -05:00
Andrew Bauer 52603b24c0 Update .travis.yml
Add 32bit centos builds using my docker repo
2017-08-21 13:35:57 -05:00
Andrew Bauer 613bbfb65b arm neon-check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect (#1966)
* arm neon - check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect

* skip arm neon check it not on linux
2017-08-21 12:02:28 -04:00
Andrew Bauer ac5d1738ea allow changing of the timestamp char code delimeter (#1972) 2017-08-21 11:27:11 -04:00
jethornton 431ec3ea75 Update faq.rst (#1970)
The memory math is confusing and incorrect. Original posted added a 5th camera but did not update the final memory size or explain how they arrived at that value.
2017-08-21 11:25:44 -04:00
Andrew Bauer 5030254ba0 build f26 packages with my docker repo
The packpack project does not provide a fedora 26 docker image so I made my own.
2017-08-20 20:12:18 -05:00
Andrew Bauer dc1aa2b670 Update redhat.rst 2017-08-19 21:41:19 -05:00
Andrew Bauer 7d0531ccdd Update packpack.rst 2017-08-19 21:37:04 -05:00
Andrew Bauer e749866101 Update packpack.rst 2017-08-19 21:17:06 -05:00
Andrew Bauer 20b0a26bc5 Update startpackpack.sh 2017-08-19 20:59:30 -05:00
Andrew Bauer ccb7e08aae remove extra whitespace 2017-08-19 20:58:26 -05:00
Andrew Bauer 25c19198f6 packpack - relax the requirements for repoquery 2017-08-19 20:57:41 -05:00
Andy Bauer 7ceb88866c packpack - put pack redhat specific packpack parms 2017-08-19 17:47:06 -05:00
Andy Bauer 4e61f2f55a packpack - don't filter output when we aren't in travis 2017-08-19 17:17:18 -05:00
Andy Bauer a191486c18 packpack - update rpm fusion download url 2017-08-19 16:56:17 -05:00
Andrew Bauer 54f780e2d3 Update redhat.rst 2017-08-19 13:15:11 -05:00
Andrew Bauer 4ccca556e1 Update packpack.rst 2017-08-19 12:52:21 -05:00
Andrew Bauer 52accd7ff5 Update packpack.rst 2017-08-19 12:50:07 -05:00
Andrew Bauer 9172a1bc42 Update packpack.rst 2017-08-19 12:48:57 -05:00
Andrew Bauer e473806fff Update packpack.rst 2017-08-19 12:47:41 -05:00
Andrew Bauer 8bf395465f Update packpack.rst 2017-08-19 12:46:38 -05:00
Andrew Bauer 65f03ce613 Update packpack.rst 2017-08-19 12:46:00 -05:00
Andrew Bauer 7ed53f766e Update packpack.rst 2017-08-19 12:45:39 -05:00
Andrew Bauer 7a1208daaa Update packpack.rst 2017-08-19 12:43:28 -05:00
Andrew Bauer 4adad745d0 Update packpack.rst
fix bullets
2017-08-19 12:42:44 -05:00
Andy Bauer dafe125ed5 initial commit to add packpack build instructions 2017-08-19 12:39:54 -05:00
Andy Bauer 76b9a9dc01 build non-el6 rpms from rpm fusion rather than zmrepo 2017-08-19 09:07:32 -05:00
Andrew Bauer 05b9b8bc51 Update .travis.yml
remove nightly build support for fedora 24
2017-08-16 18:53:02 -05:00
peruchi d71b30aff3 Images Gif to PNG (#1969)
* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG
2017-08-16 14:51:20 -04:00
Isaac Connor f573158fbb fix breakage caused by empty SSL_CERT options 2017-08-15 19:40:02 -04:00
Isaac Connor b6965a2c3f fix spacing/braces 2017-08-14 11:38:21 -04:00
Andrew Bauer 7f80b72371 Merge pull request #1929 from connortechnology/fix_event_viewing
Fix event viewing
2017-08-14 09:52:56 -05:00