Commit Graph

9643 Commits

Author SHA1 Message Date
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
Isaac Connor 6e24eb6462 use find_one ins tead of New when loading event to determine if event still exists in db 2017-08-18 09:28:14 -04:00
Isaac Connor f01adc6be5 fixes 2017-08-17 10:18:51 -04: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 b9fdeb2272 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-08-16 13:41:57 -04:00
Isaac Connor a63d0878b6 remove more hwaccel code 2017-08-16 13:41:44 -04:00
Isaac Connor fbe5385e06 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-08-16 12:41:23 -04:00
Isaac Connor da5438a6ff detect hardware accel capabilities 2017-08-16 12:16:15 -04:00
Isaac Connor c421091411 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-08-16 11:32:09 -04:00
Isaac Connor 9e2aa941fc rough in vaapi and qsv decoders. More debugging 2017-08-16 11:31:47 -04:00
Isaac Connor f573158fbb fix breakage caused by empty SSL_CERT options 2017-08-15 19:40:02 -04:00
Isaac Connor ad0644b906 Merge branch 'storageareas' into vaapi 2017-08-15 16:05:25 -04:00
Isaac Connor 8a0c497a47 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-08-15 13:56:32 -04:00
Isaac Connor 53e5b7000c Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-08-15 13:51:32 -04:00
Isaac Connor 0cac55cfab Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-08-15 13:50:08 -04:00
Isaac Connor e24a2935d2 remove unneeded error message 2017-08-15 13:49:11 -04:00
Isaac Connor 591fdfe68c fix 2017-08-15 13:44:23 -04:00
Isaac Connor 38111e80a5 use AVERROR_EOF instead of EOF 2017-08-15 13:17:51 -04:00
Isaac Connor 85202a0bfd add test for when an event is deleted during audit 2017-08-15 13:06:59 -04:00
Isaac Connor 0775725a76 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-08-15 12:55:07 -04:00
Isaac Connor ae579c9649 potentially fix a crash when camera sends aac 2017-08-15 12:16:29 -04:00
Isaac Connor d629bd43a0 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-08-14 18:23:24 -04:00
Isaac Connor adab628af9 fix video speed, various other 2017-08-14 18:22:52 -04:00
Isaac Connor b6965a2c3f fix spacing/braces 2017-08-14 11:38:21 -04:00
Isaac Connor b255414bbb Merge branch 'storageareas' into remove_ffmpeg_thread 2017-08-14 11:15:25 -04:00
Isaac Connor 0f0ab6170b Don't decode video until we have received a keyframe. 2017-08-14 11:15:09 -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 49464d381a Merge branch 'master' into storageareas 2017-08-14 10:44:40 -04: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