Isaac Connor
11fc755db2
fix debug_all
2017-10-27 15:21:10 -07:00
Isaac Connor
a4dc460c38
Merge branch 'ffmpeg_output' of github.com:connortechnology/ZoneMinder into ffmpeg_output
2017-10-27 09:07:10 -07:00
Isaac Connor
e84bf6260b
add save, set, transform, and some globals pointing to dbh and log
2017-10-27 09:05:25 -07:00
Isaac Connor
230daa74da
add apache log style aliases
2017-10-27 09:05:07 -07:00
Isaac Connor
52293b1791
Merge branch 'ffmpeg_output' of github.com:connortechnology/ZoneMinder into ffmpeg_output
2017-10-26 21:15:17 -07:00
Isaac Connor
0265a48a30
fix seg fault, fix pkt pts dts/duration. Stil wrong framerate
2017-10-26 10:12:56 -07:00
Isaac Connor
ec3b18f8e8
add rouhged in output
2017-10-25 13:27:34 -07:00
Isaac Connor
12b611b9d5
When in live mode say Camera Offline instead of no data
2017-10-25 13:02:28 -07:00
Isaac Connor
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
Isaac Connor
127608e36a
add Indexes to logs
2017-10-25 11:10:56 -07:00
Isaac Connor
ea84bd1e69
add a Status Filter
2017-10-25 09:04:54 -07:00
Isaac Connor
b6dde354be
rename AnalysisFPS to AnalysisFPSLimit
2017-10-24 17:34:32 -07:00
Isaac Connor
0fc6852065
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-24 16:25:49 -07:00
Isaac Connor
e9600bc5d3
add monitors.php
2017-10-24 16:25:11 -07:00
Isaac Connor
ca17d9dba4
change the systemd zoneminder.server to always restart zoneminder with a 10 second wait
2017-10-24 16:24:23 -07:00
Isaac Connor
df14b3c812
handle failure to connect to zmc in zms gracefully
2017-10-24 16:22:26 -07:00
Isaac Connor
fdbbc5101e
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-10-24 16:10:20 -07:00
Isaac Connor
b54d340bda
google code style fix
2017-10-24 16:10:16 -07:00
Isaac Connor
e34ed8898a
Add Index to Logs
2017-10-24 16:10:04 -07:00
Isaac Connor
ea669b4750
increase size of group edit popup
2017-10-24 16:09:12 -07:00
Isaac Connor
6905c6a1fb
add CpuLoad t Servers list
2017-10-24 16:08:52 -07:00
Isaac Connor
cfaf10335b
add Monitor status, capturrFPS and AnalysisFPS to processes
2017-10-24 16:08:31 -07:00
Isaac Connor
199f90868a
add libsys-cpuload-perl as a dependency
2017-10-24 15:17:09 -07:00
Isaac Connor
3c0be45eb8
have zmdc.pl update the Servers table with system status information
2017-10-24 15:13:48 -07:00
Isaac Connor
a4b153a4f8
bnumpm version to pickup Servers updates
2017-10-24 15:13:18 -07:00
Isaac Connor
cedad14507
fix Load->CpuLoad
2017-10-24 15:13:02 -07:00
Isaac Connor
f32103b01d
Add Load, Mem, Swap to Servers
2017-10-24 14:21:25 -07:00
Isaac Connor
5ba6cf0fb2
Add DiskSpace to Events listings on console
2017-10-24 14:19:36 -07:00
Isaac Connor
82bf507ee9
Add Status, ram, swap to Servers List
2017-10-24 12:43:32 -07:00
Isaac Connor
6c03ae32c2
add code to update the statuses in the Server record every second. This code also reduces the timeout from .1 seconds to 1 second. Should reduce load by zmdc on low power devices. I see no reason to poll that heavily...
2017-10-24 12:31:23 -07:00
Isaac Connor
12fd1c151e
add Load and Memory fields to Servers
2017-10-24 11:58:44 -07:00
Isaac Connor
59e50bbbef
Update DiskSpace when we create jpg's
2017-10-23 17:04:02 -07:00
Isaac Connor
6b2d0aa59b
fix popup when clicking on a monitor on montagereview
2017-10-23 17:03:41 -07:00
Isaac Connor
5e98587ff4
add Server and Storage filters to montagereview
2017-10-23 17:03:18 -07:00
Isaac Connor
9cbd33b439
if there is a selected monitor but it isn't in the available monitors, still show the monitors
2017-10-23 17:02:47 -07:00
Isaac Connor
729fdb4fdd
add a popup size for monitors
2017-10-23 17:02:21 -07:00
Isaac Connor
b5e59efda5
improve updating diskSpace entries
2017-10-23 17:02:04 -07:00
Isaac Connor
d2c8a0240a
add a monitors view which is for editing function/enabled/server/storage of multiple monitors
2017-10-23 17:01:43 -07:00
Isaac Connor
ced5015a83
move zmcControl and zmaControl to the Monitor Object
2017-10-23 17:00:59 -07:00
Isaac Connor
df8fbaccea
Fixes
2017-10-23 11:50:45 -07:00
Isaac Connor
f99e404730
update the total_disk_space function to do and sql sum on the events that already have a space assigned and only update ones that don't. This reduces ram requirements.
2017-10-23 11:02:36 -07:00
Isaac Connor
a836dd5ab3
UPdate DiskSpace when creating frame images from the mp4
2017-10-23 10:55:24 -07:00
Isaac Connor
d477067fa6
add Id and Name as a title popup to the cnanvas so if you mouse over it you can see which monitor it is
2017-10-23 10:55:04 -07:00
Isaac Connor
681abd64fc
Instead of No Data, make a more general function that will write any text without clearing the image behind it
2017-10-23 10:54:38 -07:00
Isaac Connor
ed9da696b3
Rough in save functionality into Event.
2017-10-23 10:53:58 -07:00
Isaac Connor
57bc975454
Rouch in Maps
2017-10-23 10:52:51 -07:00
Isaac Connor
bd95cd1de9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-23 09:56:42 -04:00
Isaac Connor
2d3aa08303
include <0 in test on event frame timestamp
2017-10-23 09:56:30 -04:00
Isaac Connor
7ccf06ec3e
Merge pull request #40 from digital-gnome/AjaxNavigationAndResizing
...
Ajax navigation and resizing
2017-10-22 22:44:30 -04:00
digital-gnome
1bddec1548
Bypass refreshParentWindow
...
This hasn't worked for a while. It looks like it's the result of a fix for filter window redirecting. It's possible other things use it but this fixes event deletion without touching anything else.
2017-10-22 17:23:04 -04:00