71581831b5
fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons
2020-01-05 17:34:27 -05:00
f7e01aa999
switch to material icon for dot
2019-12-02 14:31:05 -05:00
cf35db120d
change to material icons, fix missing div
2019-12-02 14:21:51 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
ca0b583007
Use material icons for sort because they look nicer
2019-08-19 08:59:15 -04:00
b254e1e392
For column name title field should be taken instead of array name ( #2635 )
2019-06-06 12:58:33 -04:00
279e0d8bcf
Merge branch 'storageareas' into zma_to_thread
2019-02-22 11:39:58 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
99f1e23c5b
Replace usage of PHP_SELF in views/. Fixes #2450
2019-02-09 21:39:19 -08:00
fa6716a64b
console: Escape source column output to prevent XSS. Fixes #2452
2019-02-09 02:28:40 -08:00
d7ebc85d81
Replace remaining `console` inline event handlers ( #2432 )
...
* Use a hidden submit button in _monitor_filters rather than onkeydown
* events/console: Convert checkbox header toggle inline event listeners
2019-01-21 11:11:40 -05:00
eef113b6a7
Convert some characters to HTML entities ( #2417 )
2019-01-18 10:02:48 -05:00
d33fec9c3f
Add a CSP script-src policy with nonce-source and convert more inline event handlers ( #2413 )
...
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy
* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'
Only handle ones that don't return a value.
* Use @data-on-click to attach inline click event handlers with no args and no return value
* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument
* Enforce a script-src CSP on views without inline JS
* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -05:00
fe5cb4bfdc
Merge pull request #2283 from connortechnology/warn_colour_when_disabled
...
Use a warning colour when motion detection is disabled.
2018-12-11 09:36:07 -06:00
4d7e98475f
Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML
...
Introduce get body top html
2018-12-11 09:35:54 -06:00
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
246765ced9
Add tooltip for sorting monitors
2018-11-11 16:23:19 -05:00
702143e51b
Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top.
...
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.
This is a pretty quick, crude implementation.
2018-11-07 12:33:54 -05:00
f95379742b
Use a warning colour when motion detection is disabled.
2018-10-30 12:04:05 -04:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
bf3e783c42
remove link to zones_overview that I never got around to creating
2018-10-10 14:13:12 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
e88c73195d
Merge branch 'fix_perl_logging' into storageareas
2018-06-08 09:30:16 -04:00
05a434893e
We should be able to edit zones even if zm isn't running
2018-06-06 16:59:07 -04:00
0937bfdf84
consoleTableBody needs to be an id in order for dragndrop sorting to work
2018-06-06 13:37:12 -04:00
94377a4652
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:57:50 -04:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
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
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -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
7702e09ec2
merge fixes
2018-02-16 16:05:30 -05:00
a82e17ff4b
Merge branch 'storageareas' into zma_to_thread
2018-02-12 17:16:33 -05:00
6518311022
Use Status and CaptureFPS and AnalysisFPS to do status coloration
2018-02-09 07:31:03 -08:00
db0c10fad2
Merge branch 'storageareas' into zma_to_thread
2018-02-08 13:58:46 -05:00
2a00cf852a
Set a type on the buttons so that they act right
2018-02-08 10:50:22 -08:00
dca1de4a13
Merge branch 'storageareas' into zma_to_thread
2018-02-08 13:30:57 -05:00
95cfdb327d
further separate addBtn and cloneBtn, fixes
2018-02-08 13:15:27 -05:00
4b6f40dd9f
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_monitor.cpp
2018-02-08 12:40:24 -05:00
babae4629a
Update and fix console buttons. Use a separate button for clone
2018-02-08 09:47:16 -05:00
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
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
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
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08:00
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
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
f0d4cab24a
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
web/ajax/add_monitors.php
2018-01-21 11:13:06 -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
e37d27e972
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_monitor.cpp
2018-01-18 13:44:26 -05: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
36ef0f5011
Merge branch 'storageareas' into zma_to_thread
2018-01-05 10:06:18 -05: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
588f63b053
Merge branch 'storageareas' into zma_to_thread
2017-12-04 17:07:16 -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
967368ce07
testing
2017-11-30 22:18:33 -05:00
106351a9f3
don't get zma status
2017-11-27 11:57:42 -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
Isaac Connor
fri.K
Isaac Connor
Matthew Noorenberghe
Andrew Bauer
Isaac Connor
Isaac Connor
Pliable Pixels
Isaac Connor
digital-gnome