Isaac Connor
|
20f6985dff
|
implement capturing bandwidth
|
2018-04-24 14:11:27 -04:00 |
|
Isaac Connor
|
3560c0d610
|
fix displayed tbale header twice
|
2018-04-21 10:35:36 -04:00 |
Isaac Connor
|
fb44619a66
|
output the initial table head
|
2018-04-19 14:33:05 -04:00 |
|
Isaac Connor
|
5b5cd3f330
|
fix broken table when no monitors to display
|
2018-04-19 14:16:30 -04:00 |
|
Isaac Connor
|
fcaac016b5
|
Merge ../ZoneMinder.connortechnology
|
2018-04-18 21:12:14 -04:00 |
|
Isaac Connor
|
d31207dd53
|
use find_one instead of new Group so that caching will happen
|
2018-04-18 12:30:47 -04:00 |
|
Isaac Connor
|
dc098b5299
|
put the status into the function column
|
2018-04-16 14:51:10 -04:00 |
|
Isaac Connor
|
cd3046abb3
|
Merge branch 'storageareas' into zma_to_thread
|
2018-04-14 11:03:08 -04:00 |
Isaac Connor
|
f9f78e9aa3
|
Convert event_id to a 64bit unsigned int
|
2018-04-12 13:40:11 -07:00 |
|
Isaac Connor
|
4adebfce1d
|
Add Monitor Status breakdown to console
|
2018-04-05 09:53:53 -07:00 |
|
Isaac Connor
|
66920eb5b8
|
fix status colour when not capturing
|
2018-04-03 12:31:54 -07:00 |
|
Isaac Connor
|
7346a8c733
|
add select button
|
2018-04-03 10:36:58 -07:00 |
|
Isaac Connor
|
4d68f9a757
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-27 13:24:57 -07:00 |
Pliable Pixels
|
caffe5f7c9
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:55:15 -04:00 |
|
Pliable Pixels
|
1b5d802890
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:43:58 -04:00 |
|
Pliable Pixels
|
1179b6ddc4
|
rounded top for tables and highlights
|
2018-03-25 11:43:34 -04:00 |
|
Pliable Pixels
|
14f638e009
|
replaced ionic fonts with material design icons
|
2018-03-25 09:28:00 -04:00 |
|
Pliable Pixels
|
10aedb51a6
|
reduced size of totals 2nd row
|
2018-03-24 18:30:50 -04:00 |
|
Pliable Pixels
|
a68cc79437
|
using MIT licensed ion-icons, its smaller than FA, replaced some text with icons
|
2018-03-24 18:25:39 -04:00 |
|
Pliable Pixels
|
0b31cc4d3d
|
2nd level header tweak
|
2018-03-24 17:34:46 -04:00 |
|
Pliable Pixels
|
b8f6c2277f
|
clone icons
|
2018-03-24 10:21:59 -04:00 |
|
Pliable Pixels
|
140217bef6
|
icons, muted colors, text tightening
|
2018-03-24 09:59:39 -04:00 |
|
Isaac Connor
|
85c757d2b1
|
Include group in parents list display
|
2018-03-23 13:35:02 -07:00 |
|
Isaac Connor
|
7e628bc3fd
|
add showing groups under Monitor Name on console
|
2018-03-01 19:23:46 -08:00 |
|
Isaac Connor
|
7702e09ec2
|
merge fixes
|
2018-02-16 16:05:30 -05:00 |
Isaac Connor
|
a82e17ff4b
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-12 17:16:33 -05:00 |
|
Isaac Connor
|
6518311022
|
Use Status and CaptureFPS and AnalysisFPS to do status coloration
|
2018-02-09 07:31:03 -08:00 |
|
Isaac Connor
|
db0c10fad2
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-08 13:58:46 -05:00 |
|
Isaac Connor
|
2a00cf852a
|
Set a type on the buttons so that they act right
|
2018-02-08 10:50:22 -08:00 |
|
Isaac Connor
|
dca1de4a13
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-08 13:30:57 -05:00 |
|
Isaac Connor
|
95cfdb327d
|
further separate addBtn and cloneBtn, fixes
|
2018-02-08 13:15:27 -05:00 |
|
Isaac Connor
|
4b6f40dd9f
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_monitor.cpp
|
2018-02-08 12:40:24 -05:00 |
|
Isaac Connor
|
babae4629a
|
Update and fix console buttons. Use a separate button for clone
|
2018-02-08 09:47:16 -05:00 |
|
Isaac Connor
|
a1392bf613
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_mpeg.cpp
src/zmc.cpp
|
2018-02-02 14:23:26 -05:00 |
|
Isaac Connor
|
7c3efc02cd
|
put back old add monitor popup
|
2018-01-31 11:56:57 -05:00 |
|
Isaac Connor
|
b1f2b677c3
|
remove path from source
|
2018-01-30 10:09:12 -05:00 |
|
Isaac Connor
|
b9a98d34bf
|
strip query and scheme from source
|
2018-01-29 19:03:16 -05:00 |
|
Isaac Connor
|
67b365948e
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
|
2018-01-29 15:53:26 -05:00 |
|
Isaac Connor
|
fb50f6f996
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-24 17:14:42 -08:00 |
|
Isaac Connor
|
71263c525b
|
:Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
|
2018-01-24 11:55:32 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
f0d4cab24a
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
web/ajax/add_monitors.php
|
2018-01-21 11:13:06 -05:00 |
|
Isaac Connor
|
181a94de82
|
test for existence of port in url_parts
|
2018-01-21 11:10:34 -05:00 |
|
Isaac Connor
|
e26747b5cc
|
show port when it's not the standard port
|
2018-01-19 12:15:26 -05:00 |
|
Isaac Connor
|
95f054c1e6
|
Show entire path for ffmpeg monitors. Strip out username/password though
|
2018-01-18 12:40:41 -08:00 |
|
Isaac Connor
|
e37d27e972
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_monitor.cpp
|
2018-01-18 13:44:26 -05:00 |
|
Isaac Connor
|
ecd5e01b92
|
Show port when using Remote Method and Port is non-standard
|
2018-01-18 10:21:05 -08:00 |
|
Isaac Connor
|
ace66cf977
|
show port in source column
|
2018-01-17 13:33:22 -08:00 |
|
Isaac Connor
|
494d080740
|
show port in source column
|
2018-01-17 13:27:44 -08:00 |
|
Isaac Connor
|
95c3c26eda
|
cleanup old Add Monitr button
|
2018-01-12 08:11:07 -08:00 |
|
Isaac Connor
|
36ef0f5011
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-05 10:06:18 -05:00 |
|
Isaac Connor
|
b219f76588
|
add togglebuttons to select all checbox
|
2017-12-23 12:58:48 -08:00 |
digital-gnome
|
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 |
Isaac Connor
|
588f63b053
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-04 17:07:16 -05:00 |
|
digital-gnome
|
f02cd2e615
|
Remove watch popup
|
2017-12-02 12:28:04 -05:00 |
|
digital-gnome
|
adc1b924da
|
Remove events popup
|
2017-12-02 12:25:53 -05:00 |
|
Isaac Connor
|
967368ce07
|
testing
|
2017-11-30 22:18:33 -05:00 |
|
Isaac Connor
|
106351a9f3
|
don't get zma status
|
2017-11-27 11:57:42 -05:00 |
|
Isaac Connor
|
4fbdacef05
|
fix event counts
|
2017-11-26 17:03:36 -05:00 |
|
Isaac Connor
|
4b92a788f7
|
fix filter execute
|
2017-11-24 15:37:50 -05:00 |
|
Isaac Connor
|
9d6b417b60
|
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
|
2017-11-22 17:03:37 -08:00 |
|
Isaac Connor
|
02ec4bdebb
|
use StartDateTime instead of DateTime in filters, and get rid of Filters button at bottom
|
2017-11-22 13:49:46 -08:00 |
|
Isaac Connor
|
3c55daaf36
|
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
|
2017-11-22 12:10:54 -08:00 |
|
Isaac Connor
|
9dd0f29e88
|
Merge branch 'storageareas' into tesla
|
2017-11-22 11:41:11 -08:00 |
|
Isaac Connor
|
cd1d2e1721
|
lots more debugging. re-add status update command on failure
|
2017-11-22 01:18:07 -05:00 |
|
Isaac Connor
|
5717a19215
|
be able to popup watch view even if the monitor is not running
|
2017-11-13 20:29:01 -05:00 |
|
Isaac Connor
|
99802945fe
|
be able to popup watch view even if the monitor is not running
|
2017-11-13 20:28:18 -05:00 |
|
Isaac Connor
|
aba7ecd9a6
|
split lines
|
2017-11-08 11:18:23 -05:00 |
|
Isaac Connor
|
09f3355e18
|
add /usr/share/zoneminder/www/cache as a temp dir
|
2017-11-04 14:52:36 -04:00 |
|
Isaac Connor
|
5aa61cf1f5
|
unset the ref so that last monitor isn't duplicated
|
2017-11-02 07:59:25 -04:00 |
|
Isaac Connor
|
1aea1517bf
|
put back old behaviour for add monitor
|
2017-11-01 13:09:14 -04:00 |
|
Isaac Connor
|
a6c790b374
|
use a shared include for the filters bar
|
2017-10-30 07:37:08 -07:00 |
|
Isaac Connor
|
bc150574c7
|
wip import
|
2017-10-26 18:56:10 -07:00 |
|
Isaac Connor
|
ea84bd1e69
|
add a Status Filter
|
2017-10-25 09:04:54 -07:00 |
|
Isaac Connor
|
5ba6cf0fb2
|
Add DiskSpace to Events listings on console
|
2017-10-24 14:19:36 -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
|
169b64813b
|
improve Server and Storage dropdown filters
|
2017-10-20 14:27:29 -04:00 |
Isaac Connor
|
d4b0c504fe
|
fix Server and Storage dropdowns
|
2017-10-19 12:44:33 -07:00 |
|
Isaac Connor
|
cf2eace2c7
|
improve htmlSelect and add Storage and Server filters to console
|
2017-10-19 09:50:07 -04:00 |
|
Isaac Connor
|
c281467e69
|
Store server and storage filters in session. Add storage and server filters to console. WIP
|
2017-10-18 13:24:41 -04:00 |
|
Isaac Connor
|
29a50626e0
|
cleanup
|
2017-10-16 12:19:38 -07:00 |
|
Isaac Connor
|
7f50a13074
|
add Event disk space recalc to zmaudit
|
2017-10-10 12:11:59 -07:00 |
|
Isaac Connor
|
827e858feb
|
use a cached Storage object to prevent hitting the db al lot
|
2017-10-05 16:11:43 -04:00 |
|
Isaac Connor
|
b56a976d7a
|
fixes to montage review and cleanup in group filtering/editing
|
2017-10-05 10:46:04 -04:00 |
|
Isaac Connor
|
87a49ad009
|
work on infinite depths of groups
|
2017-10-04 16:40:09 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
33ce55584f
|
Merge branch 'master' into storageareas
|
2017-07-26 10:48:42 -04:00 |
|
Isaac Connor
|
1cfd657168
|
put back the preg_replace that strips usernames and passwords from monitor source
|
2017-07-26 10:22:57 -04:00 |
|
Isaac Connor
|
cfbfc0dd44
|
Merge branch 'master' into storageareas
|
2017-07-21 11:04:32 -04:00 |
|
Isaac Connor
|
457d909c88
|
fix quotes
|
2017-07-21 10:54:33 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
403dca78fb
|
break up a long line
|
2017-07-13 10:26:24 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
48373f0d8b
|
fix filters on console. filter object now has terms under a Query array
|
2017-07-06 10:49:10 -04:00 |
|
Isaac Connor
|
085d239a6e
|
Merge branch 'master' into storageareas
|
2017-06-13 18:02:28 -04:00 |
|
Isaac Connor
|
371b86300a
|
Merge branch 'master' into storageareas
|
2017-06-08 14:23:40 -04:00 |
|
Isaac Connor
|
b4bdc1fd6b
|
Merge branch 'master' into dragndrop_monitor_sorting
|
2017-06-06 20:39:58 -04:00 |
|
Isaac Connor
|
bfa724d06c
|
fix spacing
|
2017-06-05 11:11:34 -04:00 |
|
Isaac Connor
|
a9183a1599
|
more quotes
|
2017-06-05 09:40:19 -04:00 |
|
Isaac Connor
|
451714a403
|
Merge branch 'master' into storageareas
|
2017-06-04 21:42:56 -04:00 |