Isaac Connor
|
c89bb8bc16
|
Merge branch 'av_logging' into storageareas
|
2018-11-23 12:46:27 -05:00 |
|
Isaac Connor
|
522ecaddd8
|
remove extra include unistd.h and we have to pre-define RecursiveMutex because we use it in zm_logger.
|
2018-11-23 12:46:10 -05:00 |
|
Isaac Connor
|
4d4666f5e0
|
add a mutex in logging functions so that multiple threads can log at the same time
|
2018-11-23 12:45:41 -05:00 |
|
Isaac Connor
|
61759a1f2d
|
older libavcodecs don't have AV_LOG_TRACE AND AV_LOG_MAX_OFFSET
|
2018-11-23 12:45:21 -05:00 |
|
Isaac Connor
|
af8626158d
|
zm_exception doesn't use anything from zm.h so don't include it
|
2018-11-23 12:44:54 -05:00 |
|
Isaac Connor
|
48564da915
|
zm_config.h shouldn't include zm.h. zm.h includs zm_config.h
|
2018-11-23 12:44:34 -05:00 |
|
Isaac Connor
|
5ad753b6b4
|
zm_comms uses logging functions, so include zm_logger.h
|
2018-11-23 12:44:10 -05:00 |
|
Isaac Connor
|
9241c26f2f
|
Move PATH_MAX to zm_config where all the other defines are
|
2018-11-23 12:43:51 -05:00 |
|
Isaac Connor
|
d16981365f
|
Merge branch 'zmaudit_check_other_storageareas' into storageareas
|
2018-11-23 12:16:21 -05:00 |
|
Isaac Connor
|
6d19280069
|
Set Scheme when Shallow. Improve debug message. Fix spacing
|
2018-11-23 12:16:11 -05:00 |
|
Isaac Connor
|
dea5db9dd9
|
Merge branch 'zmaudit_check_other_storageareas' into storageareas
|
2018-11-23 11:11:39 -05:00 |
|
Isaac Connor
|
73d27f5095
|
Add code to see if a db event is stored at the wrong storage area
|
2018-11-23 10:10:50 -05:00 |
|
Isaac Connor
|
d8d9544497
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-17 10:39:52 -05:00 |
|
Isaac Connor
|
87140ecdb5
|
white space and quiet warning
|
2018-11-17 10:39:42 -05:00 |
Andrew Bauer
|
b4f77077e9
|
Update zmdc.pl.in
temporary fix to #2292
|
2018-11-16 18:33:54 -06:00 |
|
Andrew Bauer
|
21d311942f
|
Create no-response.yml
|
2018-11-16 17:54:24 -06:00 |
|
Andrew Bauer
|
15e720d4f7
|
Create config.yml
|
2018-11-16 17:50:54 -06:00 |
|
Andrew Bauer
|
6883d5b532
|
Update ISSUE_TEMPLATE.md
|
2018-11-16 17:11:05 -06:00 |
|
Andrew Bauer
|
713e810632
|
Update ISSUE_TEMPLATE.md
|
2018-11-16 17:08:23 -06:00 |
|
Andrew Bauer
|
b353b625eb
|
rpm - configure the nginx config file in all cases
|
2018-11-16 10:40:39 -06:00 |
|
Andrew Bauer
|
8df9e4c1ee
|
Update zoneminder.logrotate.in
|
2018-11-15 20:18:56 -06:00 |
|
Andrew Bauer
|
e5f2212a32
|
fix gpl mailing address
|
2018-11-15 20:00:53 -06:00 |
|
Andrew Bauer
|
5c2e5d89ed
|
fix gpl mailing address
This makes rpmlint & lintian complain less
|
2018-11-15 19:53:45 -06:00 |
|
Isaac Connor
|
d99ee73ad3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-15 12:24:04 -05:00 |
|
Isaac Connor
|
415d43fafb
|
Include Server Name when testing for CORS. Also be case insensitive.
|
2018-11-15 12:23:52 -05:00 |
|
Isaac Connor
|
f72651da5a
|
Add auth hash to ajax fps and status calls in zone edit
|
2018-11-15 12:22:35 -05:00 |
|
Andrew Bauer
|
9b46c92ac5
|
rpm pkg - add note to zm php-fpm config file
|
2018-11-15 09:19:26 -06:00 |
|
Andrew Bauer
|
2f8c0654d5
|
rpm pkg - fix for zm php-fpm config path
|
2018-11-15 08:31:04 -06:00 |
|
Andrew Bauer
|
f2fc234880
|
rpm pkg - install zm php-fpm config in all cases for future nginx support
|
2018-11-15 08:26:54 -06:00 |
|
Isaac Connor
|
64ce035129
|
Merge branch 'av_logging' into storageareas
|
2018-11-14 17:03:32 -05:00 |
|
Isaac Connor
|
70d9fda758
|
Implement a logging callback for avcodec to use our logging functions
|
2018-11-14 17:02:52 -05:00 |
|
Isaac Connor
|
d89c0bc737
|
Merge branch 'master' into storageareas
|
2018-11-14 15:55:00 -05:00 |
|
Isaac Connor
|
aa8ac9c31c
|
spaces and quotes
|
2018-11-14 15:54:45 -05:00 |
|
Isaac Connor
|
3a409b26aa
|
Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons
|
2018-11-14 15:54:34 -05:00 |
|
Isaac Connor
|
3be31020b7
|
Automatically add width to frames view when thumbnails are turned on.
|
2018-11-14 15:54:01 -05:00 |
|
Isaac Connor
|
9d5772b517
|
Merge branch 'fix_multiserver_daemon_restarting' into storageareas
|
2018-11-14 13:02:30 -05:00 |
|
Isaac Connor
|
786ca5b22a
|
implement remove service restart for zma. Use daemonControl instead of saving the monitor when restarting zmc
|
2018-11-14 13:00:19 -05:00 |
|
Isaac Connor
|
51d8c0ea73
|
add back daemon parameter, but make it actually work
|
2018-11-14 12:59:44 -05:00 |
|
Isaac Connor
|
9d8f0fef0c
|
add templates for daemonControl to api
|
2018-11-14 12:54:40 -05:00 |
|
Isaac Connor
|
d671761a35
|
simplify params to daemonControl since they really aren't being used anyways. Return the status text
|
2018-11-14 12:54:10 -05:00 |
|
Isaac Connor
|
35b439629c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-13 18:14:35 -05:00 |
|
Isaac Connor
|
5120c6f540
|
remove compile warning by assigning AV_CODEC_NONE to the codec_id.
|
2018-11-13 18:13:55 -05:00 |
|
Isaac Connor
|
381071eb0f
|
Fix log message to say recovering instead of auditing
|
2018-11-13 16:36:39 -05:00 |
|
Isaac Connor
|
d2dc23b4e9
|
fixes, better logging
|
2018-11-13 16:35:09 -05:00 |
Andrew Bauer
|
8b50c87aab
|
Merge pull request #2307 from connortechnology/fix_32bit_alignment
remove epadding2, to restore the 64bit alignment of startup_time.
|
2018-11-13 13:38:53 -06:00 |
|
Isaac Connor
|
73c52705f2
|
Merge branch 'fix_32bit_alignment' into storageareas
|
2018-11-13 14:22:06 -05:00 |
|
Isaac Connor
|
e8ed1367d7
|
Merge branch 'master' into storageareas
|
2018-11-13 14:22:00 -05:00 |
|
Isaac Connor
|
ca87936cd7
|
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
|
2018-11-13 14:13:41 -05:00 |
|
Isaac Connor
|
798bf68df1
|
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
|
2018-11-13 14:13:32 -05:00 |
|
Isaac Connor
|
31b0ed107d
|
remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258
|
2018-11-13 14:02:44 -05:00 |