Isaac Connor
|
e15227d53e
|
remove zma restarts
|
2018-12-26 18:18:22 -05:00 |
|
Isaac Connor
|
28dafd5931
|
Merge branch 'storageareas' into zma_to_thread
|
2018-12-26 12:02:00 -05:00 |
|
Isaac Connor
|
2b8fa653ed
|
Merge branch 'small_groups_fixes' into storageareas
|
2018-12-24 09:48:36 -05:00 |
|
Isaac Connor
|
27826b4aca
|
Merge branch 'master' into storageareas
|
2018-12-24 09:48:29 -05:00 |
|
Isaac Connor
|
68adc289fe
|
Fix colspan count now that depth is zero-based
|
2018-12-24 09:40:23 -05:00 |
|
Isaac Connor
|
e0cae5709f
|
Group::find is now more powerful so we can just use it to return all Groups to be deleted
|
2018-12-24 09:39:40 -05:00 |
|
Isaac Connor
|
63199289ad
|
Change depth function to be 0-based.
|
2018-12-24 09:38:55 -05:00 |
|
Isaac Connor
|
0cce0a642b
|
Update chosen library to 1.8.7
|
2018-12-24 09:37:49 -05:00 |
Andrew Bauer
|
153877b9c0
|
Merge pull request #2359 from connortechnology/fix_2353
Update permissions checking for Groups to not use session. Fixes #2353
|
2018-12-21 15:16:49 -06:00 |
|
Isaac Connor
|
e5a073c8df
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-12-21 10:50:30 -05:00 |
|
Isaac Connor
|
1130d6650a
|
Fix spacing and pass popup to previous/next event so that popups stay as popups
|
2018-12-21 10:50:19 -05:00 |
|
Isaac Connor
|
47465260d1
|
Update permissions checking for Groups to not use session. Fixes #2353
|
2018-12-21 10:01:48 -05:00 |
|
Andrew Bauer
|
6eb7892fc7
|
Merge pull request #2357 from connortechnology/libswresample
Implement libswresample support as an alternative to libavresample, w…
|
2018-12-20 16:44:06 -06:00 |
|
Isaac Connor
|
7a8beffdcc
|
Merge branch 'master' into storageareas
|
2018-12-20 15:10:52 -05:00 |
|
Isaac Connor
|
48865f124b
|
cap AAC bitrate at 96000 to prevent the aac encoder from complaining
|
2018-12-20 15:10:04 -05:00 |
|
Isaac Connor
|
a277f697e9
|
whitespace
|
2018-12-20 14:58:38 -05:00 |
|
Isaac Connor
|
e626049f6b
|
Merge branch 'swresample' into storageareas
|
2018-12-20 14:08:40 -05:00 |
|
Isaac Connor
|
6ee72aa2d9
|
Implement libswresample support as an alternative to libavresample, which is deprecated
|
2018-12-20 14:06:56 -05:00 |
|
Isaac Connor
|
0c09616059
|
put back privacy notice update
|
2018-12-20 13:58:09 -05:00 |
|
Isaac Connor
|
88e148068e
|
Logging and whitespace
|
2018-12-20 13:56:57 -05:00 |
|
Isaac Connor
|
6af8f0d419
|
Logging and whitespace
|
2018-12-20 13:55:18 -05:00 |
|
Isaac Connor
|
64bdf40e86
|
Logging and whitespace changes. No logical changes
|
2018-12-20 13:50:55 -05:00 |
|
Isaac Connor
|
eccfdb8a6a
|
Logging and whitespace changes. No logical changes
|
2018-12-20 13:50:07 -05:00 |
|
Isaac Connor
|
8b239752ae
|
Merge branch 'master' into swresample
|
2018-12-20 13:48:37 -05:00 |
|
Isaac Connor
|
1d371b7a17
|
Fix small memleak of linked_monitors not getting freed on Monitor destruction. Fix unlocking db mutex before logging
|
2018-12-20 13:41:57 -05:00 |
|
Isaac Connor
|
3f1e495872
|
Add libswresample to dependencies
|
2018-12-20 13:41:09 -05:00 |
|
Isaac Connor
|
53c66e44db
|
Implement libswresample in place of libavresample which is deprecated
|
2018-12-20 13:38:24 -05:00 |
|
Isaac Connor
|
62ce3c1f65
|
Implement libswresample in place of libavresample which is deprecated
|
2018-12-20 13:38:11 -05:00 |
|
Isaac Connor
|
d4fb85a9aa
|
Merge branch 'master' into swresample
|
2018-12-20 09:16:27 -05:00 |
|
Isaac Connor
|
3a068ae6a3
|
Merge branch 'master' into swresample
|
2018-12-16 16:15:28 -05:00 |
Pliable Pixels
|
622c17f628
|
make sure auth is regenerated each time we call this API (#2347)
|
2018-12-16 11:02:07 -05:00 |
|
Andrew Bauer
|
c1f46a9cb0
|
Update README.httpd
|
2018-12-15 16:29:44 -06:00 |
|
Andrew Bauer
|
5a6e700c45
|
rpm packaging - update fcgiwrap socket location
I pushed a new fgciwrap package to Fedora and the socket file in the package is in a different location. See: https://bugzilla.redhat.com/show_bug.cgi?id=1655281
|
2018-12-14 20:27:12 -06:00 |
|
Isaac Connor
|
89c9a28614
|
Merge branch 'master' into storageareas
|
2018-12-14 12:25:06 -05:00 |
|
Isaac Connor
|
ad4f131284
|
Must unlock before logging
|
2018-12-14 12:22:10 -05:00 |
|
Isaac Connor
|
0bfe1007c8
|
Merge branch 'master' into storageareas
|
2018-12-14 10:16:08 -05:00 |
|
Isaac Connor
|
1a05e777c0
|
fix path not being constructed properly for shallow event storage
|
2018-12-14 08:54:29 -05:00 |
|
Isaac Connor
|
83e74aec55
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-12-14 08:40:45 -05:00 |
|
Isaac Connor
|
70388753ea
|
COmment out logging in signal handlers. Logging is too complex.
|
2018-12-14 08:40:32 -05:00 |
|
Isaac Connor
|
e9ae2e6968
|
COmment out logging in signal handlers. Logging is too complex.
|
2018-12-14 08:39:55 -05:00 |
|
Pliable Pixels
|
ebaafef607
|
Ffmpeg logs optional (#2345)
* make ffmpeg logs configurable via web
* fix Info
|
2018-12-14 08:01:23 -05:00 |
|
Andrew Bauer
|
3a08178500
|
Create support.yml
|
2018-12-13 19:00:46 -06:00 |
|
Isaac Connor
|
dd033cb069
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-12-13 16:20:20 -05:00 |
|
Isaac Connor
|
a1e9058729
|
adjust ffmpeg logging levels
|
2018-12-13 16:19:55 -05:00 |
|
Isaac Connor
|
b61eb7d4fc
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-12-13 10:53:56 -05:00 |
|
Isaac Connor
|
0c5eead929
|
Merge branch 'master' into fix_startup_db_connection
|
2018-12-13 10:53:34 -05:00 |
|
Isaac Connor
|
0784a8a5a1
|
reduce ffmpeg log levels from error to warning and warning to info. Ffmpeg outputs a lot of errors that don't significantly affect video recording.
|
2018-12-13 10:27:44 -05:00 |
|
Isaac Connor
|
50b67fe6bf
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-12-13 10:25:52 -05:00 |
Mike Rosack
|
567b60ffa7
|
support for forwarded proto/port in Server.php (#2343)
|
2018-12-13 10:24:32 -05:00 |
|
Andrew Bauer
|
882c4e2ea6
|
Update zm_update-1.33.0.sql
fixes #2342
|
2018-12-12 20:55:50 -06:00 |