Commit Graph

7627 Commits

Author SHA1 Message Date
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
Isaac Connor 087b7abb94 Merge branch 'master' into fix_event_viewing 2017-08-14 10:41:04 -04:00
Isaac Connor d8d45995cc Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-08-14 10:31:25 -04:00
ralimi ecb7df0e8b Support SSL for mysql connections (#1965)
* 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.

* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
Andrew Bauer c353d5d17b Update CMakeLists.txt
fix erroneous creation of /etc/zm/conf.d/conf.d during an out-of-source build
2017-08-14 08:45:03 -05:00
Andrew Bauer edd66dd0cf Update redhat.rst 2017-08-11 12:41:12 -05:00
Andrew Bauer 0936dc79bc Update redhat.rst 2017-08-11 12:37:44 -05:00
Andrew Bauer 4aa15702e7 Update redhat.rst 2017-08-11 12:33:39 -05:00
Andrew Bauer 3a7ad58c25 Update redhat.rst 2017-08-11 08:55:57 -05:00
Andrew Bauer 4187da2d5a Update redhat.rst 2017-08-11 08:45:34 -05:00
Andrew Bauer ae8873c2cc Update redhat.rst 2017-08-11 08:44:02 -05:00
Andrew Bauer 565612b86b Update redhat.rst 2017-08-11 07:55:29 -05:00
Andrew Bauer 64cf80ccf4 Update redhat.rst 2017-08-11 07:52:25 -05:00
Andrew Bauer 4941e6715c Update redhat.rst 2017-08-11 07:49:59 -05:00
Andrew Bauer 27796ab720 Update redhat.rst 2017-08-10 20:57:26 -05:00
Andrew Bauer 0a5188d79f Update redhat.rst 2017-08-10 20:55:22 -05:00
Andrew Bauer a64810fcfc Update README.md 2017-08-10 20:34:48 -05:00
Andrew Bauer fd7ea84e81 Update README.md
Point users to rpmfusion for zoneminder rpm releases
2017-08-10 20:34:05 -05:00
Andrew Bauer c5c68d064e Merge pull request #1930 from connortechnology/split_zmeventstream
split EventStream into it's own files
2017-08-09 20:36:17 -05:00
Isaac Connor 6562d5eb47 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-08-09 09:54:34 -04:00
Isaac Connor 928c4651a6 fix braces, spacing 2017-08-09 09:54:27 -04:00
Isaac Connor ba3acbf683 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-08-03 11:34:19 -04:00
Isaac Connor 5a73c38237 video storage fixes (#1958)
* use a monitor object instead of just a db array.

* fix braces, spacing, move pod docs to bottom

* Fix memleak by freeing input and output frames

* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
Isaac Connor 7e5edf1623 Always set the packet stream_index to the id of the output stream. 2017-08-02 16:23:37 -04:00
Isaac Connor 3b97fdadc4 Fix memleak by freeing input and output frames 2017-07-31 15:57:07 -04:00
Isaac Connor 30057ddffe Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-07-26 10:38:25 -04:00