3fd953a4eb
Move code to generate Source from console into Monitor Object
2018-05-04 06:46:46 -07:00
e64de07560
spacing
2018-05-03 09:39:09 -07: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
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
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
fcaac016b5
Merge ../ZoneMinder.connortechnology
2018-04-18 21:12:14 -04:00
d31207dd53
use find_one instead of new Group so that caching will happen
2018-04-18 12:30:47 -04:00
dc098b5299
put the status into the function column
2018-04-16 14:51:10 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
4adebfce1d
Add Monitor Status breakdown to console
2018-04-05 09:53:53 -07:00
66920eb5b8
fix status colour when not capturing
2018-04-03 12:31:54 -07:00
7346a8c733
add select button
2018-04-03 10:36:58 -07:00
4d68f9a757
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-27 13:24:57 -07:00
caffe5f7c9
dot should be red when either fclass or source_class is red
2018-03-27 08:55:15 -04:00
1b5d802890
dot should be red when either fclass or source_class is red
2018-03-27 08:43:58 -04:00
1179b6ddc4
rounded top for tables and highlights
2018-03-25 11:43:34 -04:00
14f638e009
replaced ionic fonts with material design icons
2018-03-25 09:28:00 -04:00
10aedb51a6
reduced size of totals 2nd row
2018-03-24 18:30:50 -04:00
a68cc79437
using MIT licensed ion-icons, its smaller than FA, replaced some text with icons
2018-03-24 18:25:39 -04:00
0b31cc4d3d
2nd level header tweak
2018-03-24 17:34:46 -04:00
b8f6c2277f
clone icons
2018-03-24 10:21:59 -04:00
140217bef6
icons, muted colors, text tightening
2018-03-24 09:59:39 -04:00
85c757d2b1
Include group in parents list display
2018-03-23 13:35:02 -07:00
7e628bc3fd
add showing groups under Monitor Name on console
2018-03-01 19:23:46 -08:00
6518311022
Use Status and CaptureFPS and AnalysisFPS to do status coloration
2018-02-09 07:31:03 -08:00
2a00cf852a
Set a type on the buttons so that they act right
2018-02-08 10:50:22 -08:00
babae4629a
Update and fix console buttons. Use a separate button for clone
2018-02-08 09:47:16 -05:00
7c3efc02cd
put back old add monitor popup
2018-01-31 11:56:57 -05:00
b1f2b677c3
remove path from source
2018-01-30 10:09:12 -05:00
b9a98d34bf
strip query and scheme from source
2018-01-29 19:03:16 -05:00
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08:00
50fc4a2d94
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
2018-01-24 11:51:11 -05:00
181a94de82
test for existence of port in url_parts
2018-01-21 11:10:34 -05:00
e26747b5cc
show port when it's not the standard port
2018-01-19 12:15:26 -05:00
95f054c1e6
Show entire path for ffmpeg monitors. Strip out username/password though
2018-01-18 12:40:41 -08:00
ecd5e01b92
Show port when using Remote Method and Port is non-standard
2018-01-18 10:21:05 -08:00
ace66cf977
show port in source column
2018-01-17 13:33:22 -08:00
494d080740
show port in source column
2018-01-17 13:27:44 -08:00
95c3c26eda
cleanup old Add Monitr button
2018-01-12 08:11:07 -08:00
b219f76588
add togglebuttons to select all checbox
2017-12-23 12:58:48 -08:00
8bfdb73d24
Fix missing change to StartDateTime
...
Fixes filter loading from events if clicked from last hour link.
2017-12-20 15:46:03 -05:00
f02cd2e615
Remove watch popup
2017-12-02 12:28:04 -05:00
adc1b924da
Remove events popup
2017-12-02 12:25:53 -05:00
4fbdacef05
fix event counts
2017-11-26 17:03:36 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
02ec4bdebb
use StartDateTime instead of DateTime in filters, and get rid of Filters button at bottom
2017-11-22 13:49:46 -08:00
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
5717a19215
be able to popup watch view even if the monitor is not running
2017-11-13 20:29:01 -05:00
99802945fe
be able to popup watch view even if the monitor is not running
2017-11-13 20:28:18 -05:00
aba7ecd9a6
split lines
2017-11-08 11:18:23 -05:00
09f3355e18
add /usr/share/zoneminder/www/cache as a temp dir
2017-11-04 14:52:36 -04:00
5aa61cf1f5
unset the ref so that last monitor isn't duplicated
2017-11-02 07:59:25 -04:00
1aea1517bf
put back old behaviour for add monitor
2017-11-01 13:09:14 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
ea84bd1e69
add a Status Filter
2017-10-25 09:04:54 -07:00
5ba6cf0fb2
Add DiskSpace to Events listings on console
2017-10-24 14:19:36 -07:00
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
169b64813b
improve Server and Storage dropdown filters
2017-10-20 14:27:29 -04:00
d4b0c504fe
fix Server and Storage dropdowns
2017-10-19 12:44:33 -07:00
cf2eace2c7
improve htmlSelect and add Storage and Server filters to console
2017-10-19 09:50:07 -04:00
c281467e69
Store server and storage filters in session. Add storage and server filters to console. WIP
2017-10-18 13:24:41 -04:00
29a50626e0
cleanup
2017-10-16 12:19:38 -07:00
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
827e858feb
use a cached Storage object to prevent hitting the db al lot
2017-10-05 16:11:43 -04:00
b56a976d7a
fixes to montage review and cleanup in group filtering/editing
2017-10-05 10:46:04 -04:00
87a49ad009
work on infinite depths of groups
2017-10-04 16:40:09 -04:00
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00
33ce55584f
Merge branch 'master' into storageareas
2017-07-26 10:48:42 -04:00
1cfd657168
put back the preg_replace that strips usernames and passwords from monitor source
2017-07-26 10:22:57 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
457d909c88
fix quotes
2017-07-21 10:54:33 -04:00
d13d7e9050
recode the bit that outputs the link under source so that it defaults to Monitor # under all situations
2017-07-14 09:57:25 -04:00
403dca78fb
break up a long line
2017-07-13 10:26:24 -04:00
22e957ba46
clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100%
2017-07-12 12:49:01 -04:00
48373f0d8b
fix filters on console. filter object now has terms under a Query array
2017-07-06 10:49:10 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
b4bdc1fd6b
Merge branch 'master' into dragndrop_monitor_sorting
2017-06-06 20:39:58 -04:00
bfa724d06c
fix spacing
2017-06-05 11:11:34 -04:00
a9183a1599
more quotes
2017-06-05 09:40:19 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
555a667035
fix filter button
2017-06-02 12:12:59 -04:00
e47adcf6cc
the tfoot has to come after the tbody
2017-06-01 09:36:00 -04:00
73ca07792b
double quotes to single quotes
2017-05-31 22:11:54 -04:00
5c67c87147
remove deprecated cellspacing attr on table
2017-05-31 22:08:44 -04:00
a940fe429c
deprecate the use of the center tag, and only put in the development h3 if it has contents
2017-05-31 22:08:05 -04:00
98b49fb64d
quotes, spacing
2017-05-31 21:28:40 -04:00
bb051fd509
fix merge conflicts
2017-05-25 15:29:31 -04:00
7cfa0b12ec
Merge branch 'dragndrop_monitor_sorting' into storageareas
2017-05-25 15:26:04 -04:00
229c8c6e23
Mmove Right buttons to the left, because there is no more room on the right anymore, move the script that sets up the sorting to js/console.js
2017-05-25 15:03:10 -04:00
afce83d289
Merge branch 'master' into dragndrop_monitor_sorting
2017-05-25 14:31:41 -04:00
31b5a99b43
remove old code to do sequence up/down arrows, replace with jquery sortable
2017-05-25 14:30:07 -04:00
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac Connor
Pliable Pixels
digital-gnome
Isaac Connor
Isaac Connor