3109536dda
Alternate fix for video generation under csrf. Now we just turn off output buffering (discarding contents before sending the avi
2018-06-06 11:55:51 -04:00
d961b74084
spacing and double to single quotes
2018-06-06 11:41:00 -04:00
5d772f16f6
fix closing td
2018-06-01 16:18:07 -04:00
77b144a13e
must specify type=button or else some browsers treat it as a submit button
2018-05-18 16:07:58 +02:00
7ad6b01310
double to single quotes and spacing
2018-05-18 15:52:12 +02:00
d8a62e0ede
Show total size for non-montage review downloads as well
2018-05-18 15:51:42 +02:00
2a8ea98249
remove blank space at end of line
2018-05-18 09:12:10 -04:00
4815162bea
fix extra }
2018-05-18 09:11:15 -04:00
8276386a44
We always return an associative array now
2018-05-18 09:06:17 -04:00
fdaf992156
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-16 14:18:48 -04:00
93dd943fec
Fix some spacing
2018-05-16 20:17:57 +02:00
780cb693c2
google code style
2018-05-16 11:14:11 -04:00
81c4542a94
correct use of getValue. Use standard ddm element value instead
2018-05-16 11:13:59 -04:00
f16e1953d9
Make Source filter apply to Path as well
2018-05-15 10:45:10 -07:00
485f292943
fix php 5.4 compatibility - remove calls to empty
2018-05-14 12:32:48 -05:00
b2115f9dcf
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-08 13:34:03 -07:00
62edca6dcb
add fileSize to the api, and use it to add remote fileSize reporting in includes/Event
2018-05-08 13:33:56 -07:00
3c4befc73a
improve Name and Source filtering. Default to case insensitive text search.
2018-05-08 14:07:24 -04:00
a4911d8f39
use Event object call for file_exists, which will check remotely. Make MissingFiles and ZeroSize be a link to filter results for those events
2018-05-07 14:08:17 -07:00
2076508374
add Source and Name filters
2018-05-04 06:47:02 -07:00
3fd953a4eb
Move code to generate Source from console into Monitor Object
2018-05-04 06:46:46 -07:00
d43cd322f4
Make event count a link to a filter to list them.
2018-05-03 09:42:14 -07:00
81758fab38
use new Thumbnail code
2018-05-03 09:39:23 -07:00
e64de07560
spacing
2018-05-03 09:39:09 -07:00
dbf760d8af
cleanup no longer needed StatusFilter code. Use class=MonitorFilter instead of id=monitorControl to be consistent
2018-05-03 09:38:56 -07:00
433cffcce7
include Id in Filter dropdown
2018-04-30 15:21:05 -04:00
6c5e6e6184
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-30 07:10:38 -07:00
3f05d46012
Merge zmdc.pl fixes. We can now handle database disconnects gracefully.
2018-04-30 07:09:23 -07:00
e891c88a3e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-28 12:38:57 -04:00
abd52ebfb1
Add DiskSpace column to storage listing
2018-04-28 12:38:10 -04:00
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
dd6683f0be
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-25 10:31:47 -07:00
636d0caf30
handle no swap
2018-04-25 10:28:19 -07:00
80f73854c7
Include the groupIds hidden when not on general tab
2018-04-25 09:33:02 -04:00
5b4d160710
add total bandwidth at bottom and move buttons to top
2018-04-24 14:18:41 -04:00
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -04:00
3560c0d610
fix displayed tbale header twice
2018-04-21 10:35:36 -04:00
781438d4c5
specify E.* in query because otherwise it uses M.Id for Id
2018-04-20 14:25:38 -04:00
fedc4d4cb1
spacing
2018-04-20 14:24:56 -04:00
970830aee3
tidy up
2018-04-20 13:10:38 -04:00
fb44619a66
output the initial table head
2018-04-19 14:33:05 -04:00
5b5cd3f330
fix broken table when no monitors to display
2018-04-19 14:16:30 -04:00
983cd83054
Add default for SignalCheckPoints and add it as a hidden field to the non-misc tabs
2018-04-19 10:01:04 -04:00
cd70ed3dec
always show SignalCheckColour and add a SignalCheckPoints option
2018-04-19 09:45:28 -04:00
fcaac016b5
Merge ../ZoneMinder.connortechnology
2018-04-18 21:12:14 -04:00
28b85e1977
Add ZeroSize test to Event Audit Report
2018-04-18 13:48:20 -07:00
Isaac Connor
Isaac
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor