Isaac Connor
|
d45406bce7
|
ode style and some more debug
|
2018-09-28 11:50:34 -04:00 |
|
Isaac Connor
|
7768b4eeef
|
Don't need to delete videoStore in destructor, as it gets done in CLose()
|
2018-09-28 11:37:16 -04:00 |
|
Isaac Connor
|
da6a142d12
|
Merge branch 'master' into storageareas
|
2018-09-27 14:21:43 -04:00 |
|
Isaac Connor
|
c5c01d56be
|
fix unsetting fixed width/height/layout. Since they are actually controlled by cookies, the session will overwrite when we try to unset the cookie. Also fix some missing ;'s
|
2018-09-27 14:20:41 -04:00 |
|
Isaac Connor
|
e0dc8a5f6b
|
Merge branch 'master' into storageareas
|
2018-09-27 13:54:53 -04:00 |
|
Isaac Connor
|
66f11435b9
|
perhaps fix memory corruption due to libx264 writing to stderr which may be closed.
|
2018-09-27 13:50:11 -04:00 |
|
Isaac Connor
|
49a7614504
|
revert change that breaks building on newer ffmpeg libs.
|
2018-09-26 18:35:29 -04:00 |
|
Isaac Connor
|
7ac955d005
|
further changes to ensure that source .orig tarball is always the same
|
2018-09-26 16:44:04 -04:00 |
Isaac Connor
|
fe0ebc7067
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-26 16:20:40 -04:00 |
|
Isaac Connor
|
5ef64bf256
|
fix memleak on old libav distros
|
2018-09-26 16:20:29 -04:00 |
|
Isaac Connor
|
dbafffecb8
|
remove extra \
|
2018-09-26 16:20:08 -04:00 |
Andrew Bauer
|
c9aedb9249
|
Merge pull request #2222 from pliablepixels/patch-4
added note to make sure headers is on
|
2018-09-26 14:37:33 -05:00 |
|
Isaac Connor
|
51f0e7e5c8
|
Add a default timebase if the codec timebase is invalid. Also fix crash when we can't open the .mp4
|
2018-09-26 15:34:01 -04:00 |
|
Isaac Connor
|
1419f20dcc
|
add setting rtsp_transport to udp. It is the default but we print out an error otherwise
|
2018-09-26 15:33:29 -04:00 |
|
Isaac Connor
|
2385c80a4a
|
cleanup code a bit
|
2018-09-26 15:32:54 -04:00 |
Pliable Pixels
|
940ad3fe68
|
made message generic
|
2018-09-26 14:47:20 -04:00 |
|
Isaac Connor
|
41f1fbbec6
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-26 14:11:01 -04:00 |
|
Isaac Connor
|
7ffb46302f
|
When events have the same starttime, sort secondly by Id
|
2018-09-26 14:10:49 -04:00 |
|
Isaac Connor
|
2399615a0a
|
When events have the same starttime, sort secondly by Id
|
2018-09-26 14:10:21 -04:00 |
|
Pliable Pixels
|
6bca9415e8
|
added note to make sure headers is on
|
2018-09-26 10:17:16 -04:00 |
|
Isaac Connor
|
438b582d35
|
Merge branch 'add_export_to_filter' into storageareas
|
2018-09-25 16:11:19 -04:00 |
Isaac Connor
|
700b3c33a0
|
fix command line when using .zip
|
2018-09-25 16:09:50 -04:00 |
|
Isaac Connor
|
53f4276cb7
|
add thumbnails and an mp4 download in the events list
|
2018-09-25 16:00:01 -04:00 |
|
Isaac Connor
|
6aaa0fe39f
|
Merge branch 'add_export_to_filter' of github.com:/connortechnology/ZoneMinder into add_export_to_filter
|
2018-09-25 14:57:13 -04:00 |
|
Isaac Connor
|
01f1ffb591
|
Merge branch 'master' into add_export_to_filter
|
2018-09-25 14:54:06 -04:00 |
|
Isaac Connor
|
5615bfec40
|
some buttons need to be submit buttons. Correct Reset button and remove extra space in Delete button value
|
2018-09-25 14:47:23 -04:00 |
|
Isaac Connor
|
9c437b0303
|
Merge branch 'add_export_to_filter' into storageareas
|
2018-09-25 14:35:19 -04:00 |
|
Isaac Connor
|
8f6db1c279
|
Merge branch 'master' into storageareas
|
2018-09-25 13:54:44 -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
|
772c74243c
|
Merge branch 'master' into storageareas
|
2018-09-23 12:25:17 -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 |
|
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
|
5dba17e1fc
|
Merge branch 'master' into storageareas
|
2018-09-21 10:50:10 -04: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 |