Pliable Pixels
6bca9415e8
added note to make sure headers is on
2018-09-26 10:17:16 -04:00
Pliable Pixels
d1f93d752b
wrap again
2018-09-26 10:10:07 -04:00
Pliable Pixels
e27bd11f79
wrap
2018-09-26 10:08:08 -04:00
Pliable Pixels
8afb3d8650
formatting
2018-09-26 10:05:54 -04:00
Pliable Pixels
f1db5446d1
added license
2018-09-26 10:02:39 -04:00
Isaac Connor
5fd1034b0b
Add ServerId to perl Logging to DB
2018-09-25 13:53:50 -04:00
Andrew Bauer
97e06bb0fd
rpm - update README's
2018-09-24 18:23:40 -05:00
Isaac Connor
b55224be30
fix setting mFlush. Just have it on for DEBUG levels
2018-09-24 14:17:16 -04:00
Isaac Connor
bf9ff8461c
Add WebSite to the Monitor type enumeration
2018-09-24 13:20:19 -04:00
Isaac Connor
53555998a3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-24 09:40:24 -04:00
Isaac Connor
fd2e8a530c
When changing log levels by SIGUSR1 turn on flushing
2018-09-24 09:40:05 -04:00
Andrew Bauer
49993210d6
Create apache-cors.conf
2018-09-24 08:36:50 -05:00
Isaac Connor
7314926718
Detect mysql when mysql is run by sysv init scripts
2018-09-23 16:53:50 -04:00
Isaac Connor
45056c3602
fix deprecation warning
2018-09-23 16:51:54 -04:00
Isaac Connor
53057eae25
Always make SOCK_DIR as it may not exist due to running under systemd and being chrooted
2018-09-23 16:51:06 -04:00
Isaac Connor
94796aea2c
Always make SWAP_PATH dir as under systemd it may be chrooted
2018-09-23 16:49:57 -04:00
Isaac Connor
ee168bf427
Properly initialize preevent frames data structures. Always update analysis fps. Make some warnings on loss of signal be Info's.
2018-09-23 16:49:06 -04:00
Isaac Connor
89cd7ceaf8
Whitespace, extra parentheses, google code style
2018-09-23 16:47:06 -04:00
Isaac Connor
c8c533ca2f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-23 10:51:56 -04:00
Isaac Connor
c5b23807a4
put back overlay.js for log view.
2018-09-23 10:51:46 -04:00
Isaac Connor
af69dab9c5
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-22 14:58:28 -04:00
Isaac Connor
c8549e41da
touch the zms lock file every hour so that we can determine which ones are stale
2018-09-21 15:58:14 -04:00
Isaac Connor
f61a1b7ebd
implement a touch() utility function
2018-09-21 15:57:48 -04:00
Andrew Bauer
b8a2e71bb6
use base64_encode for monitor probe
...
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
2018-09-21 12:00:03 -05:00
Isaac Connor
c483b4ec90
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-21 10:32:02 -04:00
Isaac Connor
3f0336e63e
Fix event_id detection from link (re was wrong). Add extra check for db event when we find an event dir without identifying id info in Deep mode
2018-09-21 10:31:54 -04:00
Isaac Connor
6aa71dfc11
Fix calculation of LinkPath, as it was using RelativePath instead of Path
2018-09-21 10:31:11 -04:00
Andrew Bauer
347c0d2ae4
fix whitespace
2018-09-20 13:41:13 -05:00
Andrew Bauer
ac9129b632
fix corrupted export downloads
2018-09-20 13:36:52 -05:00
Isaac Connor
999e4c6c43
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-20 13:37:46 -04:00
Isaac Connor
90d1d79e9a
Add missing AutoUpload field to Filter
2018-09-20 13:37:36 -04:00
Isaac Connor
a568948eab
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-20 12:31:36 -04:00
Isaac Connor
884eb48420
fix the section that deletes events that have lost their event links.
2018-09-20 12:31:19 -04:00
Jonathan Lassoff
c7e1e7b901
Control plugin for Dahua PTZ cameras ( #2192 )
...
* Control plugin for Dahua PTZ cameras
* Update http/https protocol handling
* Update doc and license
* Remove license from top of file
* Use named regex capture groups for ControlAddress parsing
* Remove trailing whitespace in Trendnet.pm
2018-09-20 12:29:54 -04:00
Vitaly Saversky
18c2ec6e17
Misspelling and grammar ( #2202 )
...
* Misspelling and grammar
* Misspelling something
2018-09-20 12:14:57 -04:00
Andy Bauer
f53533e61e
fix populating onvif probe data
2018-09-20 10:30:23 -05:00
Isaac Connor
ba4878d2b5
fix use of instead of ['limit']
2018-09-20 10:11:55 -04:00
Isaac Connor
fe828d3d9c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-20 10:07:58 -04:00
Isaac Connor
503b40cb62
Need to cache the object not the row
2018-09-20 10:07:15 -04:00
Andrew Bauer
cb00445e3e
Merge pull request #2215 from connortechnology/fix_2213
...
Fix 2213
2018-09-20 08:24:07 -05:00
Isaac Connor
6181e52c47
gracefully handle non-existence of imageFeed
2018-09-20 09:07:28 -04:00
Isaac Connor
c6e953c4a9
if Monitor is not found, return empty Monitor instead of null
2018-09-20 09:02:20 -04:00
Isaac Connor
c4108a2610
Fix missing quotes inc Event::Monitor
2018-09-20 08:59:15 -04:00
Isaac Connor
95bcac4c5a
Implement delete_empty_subdirs that uses delete_empty_directories. The idea is to use it on the monitor dir so that the monitor dir gets left behind and not deleted when there are no events
2018-09-19 20:00:26 -04:00
Isaac Connor
5d8b915c2b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-19 19:50:39 -04:00
Isaac Connor
c8b10b2e3b
factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason.
2018-09-19 19:50:26 -04:00
Andrew Bauer
284d622464
update the way we access mapped mem in zm-alarm.pl
2018-09-19 12:06:09 -05:00
Isaac Connor
ef347f6ba3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-19 12:05:40 -04:00
Isaac Connor
3a9f96e8e8
Skip deleting event if event is archived. And event not having a scheme is now an error
2018-09-19 12:03:51 -04:00
Isaac Connor
8a5c989cac
fix warning when editing users after a monitor has been deleted
2018-09-18 08:52:43 -04:00