4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
ea8f264724
Merge branch 'release-1.34'
2021-01-22 15:54:06 -05:00
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
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
21aeccb5d0
centralize thumb animation js, add delay
2020-12-04 14:35:39 -06:00
08dabf1a4f
don't add "zoom" class when thumb animation is off
2020-11-25 13:29:14 -06:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
1ac5572d59
unpopup the zones view
2020-09-25 07:56:09 -05:00
ec20fdf3ad
convert function modal to ajax request
2020-09-19 10:18:59 -05:00
d2963fe28f
convert donate modal to ajax request
2020-09-19 08:55:08 -05:00
bf895f8f12
Make Zones a link to view/edit all zones
2020-09-05 09:15:09 -04:00
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
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
e9cef72d9f
Use ViewWdith/ViewHeight to get rotated dimensions when calculating thumbnail size
2020-08-27 12:44:56 -04:00
ab68bef39a
Merge branch 'master' into filter_pre_post
2020-08-26 15:28:48 -04:00
1c7bddf96e
monitor config no longer a popup
2020-08-26 12:22:19 -05:00
ac7867eab3
make function view a modal
2020-08-26 11:39:48 -05:00
fe5e005d8e
Calculate scale to pass to getStreamSrc for thumbnail still and stream
2020-08-24 17:42:23 -04:00
bce38ae2c6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 12:05:25 -04:00
56e2ac5baa
add scale to query params because zms doesn't wupport width&height
2020-08-24 12:05:14 -04:00
c6e3107a50
make donate view a modal
2020-08-24 09:31:21 -05:00
67f2e3c1a0
Merge branch 'master' into filter_pre_post
2020-08-24 10:30:01 -04:00
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
0e9c8a35e6
fix thumbnail height style. Make thumbnail clickable.
2020-08-24 09:32:49 -04:00
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
5d09ae91ab
move div tag into $imgHTML
2020-08-22 07:14:47 -05:00
8ea7b783b5
generate thumbnails when monitor is connected
2020-08-21 21:18:55 -05:00
c8e40eb5b3
don't generate tumbnails when not running
2020-08-21 21:14:16 -05:00
39d538d5cf
add missig }
2020-08-21 20:57:05 -05:00
73a01855f8
rough in thumbnail animation
2020-08-21 20:44:20 -05:00
6649a30bbb
Use querystring instead of query
2020-08-17 17:41:13 -04:00
6cbc54ef87
When storage area has been deleted, say so
2020-08-11 14:11:48 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
4851f1f940
remove errant text
2020-08-01 09:50:25 -05:00
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
45f88ee04a
float web console statusBreakdown left then down
2020-07-28 08:59:28 -05:00
47b35e97fb
implement minimize chevron for filterbar
2020-07-27 16:14:15 -05:00
767f5ebb03
navbar closes the form, and doesn't need to be in the form.
2020-07-27 12:40:46 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
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
8121787ee6
make monitors table (console view) responsive
2020-05-27 10:08:08 +02:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
b6c1a328a8
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-23 15:45:02 -04:00
6d4d925f1e
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-10 12:42:41 -04:00
55c99c5ff3
Include filtered monitors for filter query on totals line of event counts. Fixes #2846
2020-02-24 14:34:21 -05:00
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
Isaac Connor
Andrew Bauer
Isaac Connor
Romain ODDONE