Isaac Connor
6219989884
replace function with appropriate Analysing/Capturing settings. Remove function popup.
2022-01-11 10:45:11 -05:00
Isaac Connor
1f78776093
Don't change colour of dot to warning when not Enabled and not doing analysis. Add reason to the dot
2021-12-06 09:48:44 -05:00
Isaac Connor
68a7635d9b
Only show thumbnail if Function is != None
2021-08-19 18:40:50 -04:00
Isaac Connor
4d9fb5b225
Don't show live thumbnail if we do not have Stream permission. Do not show groups if not view permission. Do not make them links to montage if no stream permission
2021-04-23 09:51:38 -04:00
Isaac Connor
4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
Isaac Connor
ea8f264724
Merge branch 'release-1.34'
2021-01-22 15:54:06 -05:00
Isaac Connor
d3c84a168a
Remove the word All from the mark column on console. I think the UX is pretty universal by now.
2021-01-22 15:51:31 -05:00
Isaac Connor
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
Andrew Bauer
21aeccb5d0
centralize thumb animation js, add delay
2020-12-04 14:35:39 -06:00
Andrew Bauer
08dabf1a4f
don't add "zoom" class when thumb animation is off
2020-11-25 13:29:14 -06:00
Isaac Connor
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
Andrew Bauer
1ac5572d59
unpopup the zones view
2020-09-25 07:56:09 -05:00
Andrew Bauer
ec20fdf3ad
convert function modal to ajax request
2020-09-19 10:18:59 -05:00
Andrew Bauer
d2963fe28f
convert donate modal to ajax request
2020-09-19 08:55:08 -05:00
Isaac Connor
bf895f8f12
Make Zones a link to view/edit all zones
2020-09-05 09:15:09 -04:00
Isaac Connor
ea5d19412c
Only include the function modal once at the end as it will get populated with data before being made visible
2020-09-03 18:23:26 -04:00
Isaac Connor
762bea0761
Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot.
2020-08-31 18:30:05 -04:00
Isaac Connor
e9cef72d9f
Use ViewWdith/ViewHeight to get rotated dimensions when calculating thumbnail size
2020-08-27 12:44:56 -04:00
Isaac Connor
ab68bef39a
Merge branch 'master' into filter_pre_post
2020-08-26 15:28:48 -04:00
Andrew Bauer
1c7bddf96e
monitor config no longer a popup
2020-08-26 12:22:19 -05:00
Andrew Bauer
ac7867eab3
make function view a modal
2020-08-26 11:39:48 -05:00
Isaac Connor
fe5e005d8e
Calculate scale to pass to getStreamSrc for thumbnail still and stream
2020-08-24 17:42:23 -04:00
Isaac Connor
bce38ae2c6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 12:05:25 -04:00
Isaac Connor
56e2ac5baa
add scale to query params because zms doesn't wupport width&height
2020-08-24 12:05:14 -04:00
Andrew Bauer
c6e3107a50
make donate view a modal
2020-08-24 09:31:21 -05:00
Isaac Connor
67f2e3c1a0
Merge branch 'master' into filter_pre_post
2020-08-24 10:30:01 -04:00
Isaac Connor
b5cdc5c32d
Set width and height on image tag so browser knows how to lay them out. Fixes flickering.
2020-08-24 10:26:07 -04:00
Isaac Connor
0e9c8a35e6
fix thumbnail height style. Make thumbnail clickable.
2020-08-24 09:32:49 -04:00
Isaac Connor
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
Andrew Bauer
5d09ae91ab
move div tag into $imgHTML
2020-08-22 07:14:47 -05:00
Andrew Bauer
8ea7b783b5
generate thumbnails when monitor is connected
2020-08-21 21:18:55 -05:00
Andrew Bauer
c8e40eb5b3
don't generate tumbnails when not running
2020-08-21 21:14:16 -05:00
Andrew Bauer
39d538d5cf
add missig }
2020-08-21 20:57:05 -05:00
Andrew Bauer
73a01855f8
rough in thumbnail animation
2020-08-21 20:44:20 -05:00
Isaac Connor
6649a30bbb
Use querystring instead of query
2020-08-17 17:41:13 -04:00
Isaac Connor
6cbc54ef87
When storage area has been deleted, say so
2020-08-11 14:11:48 -04:00
Isaac Connor
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
Andrew Bauer
4851f1f940
remove errant text
2020-08-01 09:50:25 -05:00
Andrew Bauer
889b08519a
Set a small breakpoint on table-responsive
...
This fixes (ugly) horizontal scroll bars appearing at the bottom of the monitor table on larger screens, without breaking functionality on mobile devices. @roddone please test this on your mobile device
2020-08-01 09:49:27 -05:00
Andrew Bauer
45f88ee04a
float web console statusBreakdown left then down
2020-07-28 08:59:28 -05:00
Andrew Bauer
47b35e97fb
implement minimize chevron for filterbar
2020-07-27 16:14:15 -05:00
Isaac Connor
767f5ebb03
navbar closes the form, and doesn't need to be in the form.
2020-07-27 12:40:46 -04:00
Isaac Connor
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
Isaac Connor
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
Isaac Connor
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
Isaac Connor
9f821c74f6
Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor
2020-07-03 19:16:41 -04:00
Romain ODDONE
8121787ee6
make monitors table (console view) responsive
2020-05-27 10:08:08 +02:00
Isaac Connor
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
Isaac Connor
b6c1a328a8
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-23 15:45:02 -04:00
Isaac Connor
6d4d925f1e
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-10 12:42:41 -04:00