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 |
techrockedge
|
eb83f2c759
|
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
r2c ptz
|
2018-12-18 16:49:18 -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 |
|
techrockedge
|
180a4b07b1
|
foscam r2c ptz
|
2018-12-14 19:13:41 -05:00 |
|
techrockedge
|
51b4c27b27
|
foscam r2c ptz
|
2018-12-14 17:30:45 -05:00 |
|
techrockedge
|
54bf1982ca
|
add auto preset delete
|
2018-12-14 15:41:04 -05: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 |
|
techrockedge
|
e5e8559850
|
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
delete button
|
2018-12-13 17:11:57 -05: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 |
|
techrockedge
|
879fab24af
|
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
add preset delete option in the PTZ controls
|
2018-12-13 14:49:41 -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 |
|
Andrew Bauer
|
8d74354fcb
|
Merge pull request #2242 from connortechnology/cleanup_auth
Cleanup auth
|
2018-12-12 20:53:24 -06:00 |
|
Isaac Connor
|
c4bf67b063
|
fix commas
|
2018-12-12 09:17:14 -05:00 |
|
Isaac Connor
|
eba8b3327d
|
Merge branch 'master' into cleanup_auth
|
2018-12-11 16:04:42 -05:00 |
Andrew Bauer
|
ae4e1011db
|
Merge branch 'connortechnology-remove_default_view'
|
2018-12-11 09:44:31 -06:00 |
|
Andrew Bauer
|
21a98f3653
|
Merge branch 'remove_default_view' of https://github.com/connortechnology/ZoneMinder into connortechnology-remove_default_view
|
2018-12-11 09:44:13 -06:00 |
|
Isaac Connor
|
4e4c7502c3
|
put sql update into zm_update-1.33.0.sql
|
2018-12-11 10:37:52 -05:00 |
|
Isaac Connor
|
278abbc201
|
Merge branch 'master' into remove_default_view
|
2018-12-11 10:37:26 -05:00 |