Commit Graph
9544 Commits
Author SHA1 Message Date
Isaac Connor 2a2c192562 Add urlToJanus function to Server class 2023-05-11 10:13:04 -04:00
Isaac Connor b53d875dfb remove hello 2023-05-10 11:56:12 -04:00
Isaac Connor 4c39f060ab Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-05-10 11:03:47 -04:00
Isaac Connor 18790a01f6 Use unviewableMonitorIds fixing invalid user of u->MonitorIds 2023-05-10 11:03:39 -04:00
Isaac Connor a8365d40b4 Fix array uses of user object. Include data-id in monitor div. 2023-05-10 11:03:10 -04:00
Isaac Connor 8c99df24fd Set log entries to vertical-align: top. Fixes #3700 2023-05-09 12:56:10 -04:00
Isaac Connor 71b31e9ad8 Provide restricted list of HomeView in a dropdown instead of text entry 2023-05-04 15:59:00 -04:00
Isaac Connor 3f6efbd7ac add a call to streamPlay to manage play/pause button 2023-05-04 12:50:55 -04:00
Isaac Connor 6a86fbbd32 Hide/show play/pause instead of having both be there 2023-05-04 12:09:38 -04:00
Isaac Connor 8f8e770ee4 Make events table cookie last for a day instead of 60s 2023-05-04 12:09:17 -04:00
Isaac Connor 00113208bf fix typo 2023-04-28 08:44:47 -04:00
Isaac Connor 8c409fd7ff Move checkbox column to the left, main buttons to top, add icons on groups list 2023-04-28 08:29:59 -04:00
Isaac Connor 0f847f87f8 put event thumbnail in a div with fixed height to fix zoomed image going absolute 2023-04-27 13:46:41 -04:00
Isaac Connor 3ed6be9327 Use flexbox instead of floats on montage to layout better 2023-04-27 10:44:43 -04:00
Isaac Connor b5cfaef7b9 Use setScale instead of setStreamScale when applying scaling on layout change. Fixes image having wrong proportions. 2023-04-27 10:44:00 -04:00
Isaac Connor a608b18e8b Limit auto-calculated scale to 25%. Just looks bad less than that. When no bottom Element, adjust height as well. Don't need to change img.src on scale if streaming. Can just tell it to. Fix applying scale and will auto-reapply if needed. 2023-04-27 10:43:06 -04:00
Isaac Connor bac1974974 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-04-26 14:54:09 -04:00
Isaac Connor bf113217f2 Improve Axis detection 2023-04-26 14:15:08 -04:00
Isaac Connor 7825957114 Only set val from cookie if it is non-empty 2023-04-26 11:07:17 -04:00
Isaac Connor 886bac0888 When zooming thumbnails make them go absolute so they are not clipped by the container 2023-04-26 07:45:09 -04:00
Isaac Connor d3bb2144f5 Set height on thumbnail container div to prevent row from collapsing when thumbnail goes absolute 2023-04-26 07:44:15 -04:00
Isaac Connor ac3f26f3a3 Only count non deleted Monitors 2023-04-26 07:41:19 -04:00
Isaac Connor e4346aeb9d Add Server Id column 2023-04-26 07:40:48 -04:00
Isaac Connor 7f5269aa5c Sync API/Api on column name. Move checkboxes to left, buttons to top on servers tab 2023-04-26 07:25:53 -04:00
Isaac Connor 0d65281b24 Update users list to use User class instead of sql. Remove Monitors column 2023-04-25 14:01:14 -04:00
Isaac Connor d2fb365fa9 Add the ability to send a single summary email instead of individual emails per event 2023-04-24 17:53:16 -04:00
Isaac Connor 49014ac7fa replace MonitorIds with viewableMonitorIds 2023-04-24 13:53:14 -04:00
Isaac Connor e754c2093d Fix another user as array use 2023-04-24 13:09:40 -04:00
Isaac Connor b8ec6e3081 Speed up thumbnail onmouseover event. Don't clear src so that we can still see the low res image while we wait for the high res to load 2023-04-24 10:44:11 -04:00
Isaac Connor 7a0e6cfb42 Move events thumbnail to left 2023-04-24 10:30:35 -04:00
Isaac Connor dd064f606a Fix two straggling array uses of user 2023-04-24 10:16:46 -04:00
Isaac Connor 606c52ccec Fix missing ZM on Warning 2023-04-24 10:14:03 -04:00
Isaac Connor c87316d3a1 Handle not being logged in 2023-04-24 10:13:45 -04:00
Isaac Connor 035b616252 Change setCookie to take seconds as it's third argument, since that is how it has been used all through ZM's code. Also so that we can specify expirations under 1 day 2023-04-24 10:08:10 -04:00
Isaac Connor c78dc56822 Add 270px (1080/4) as an option to heights 2023-04-23 17:29:53 -04:00
stefan 1bd9def63e [API] Fix User variable from array to object
Fix $user variable from array to object to make API work again.
2023-04-23 22:07:24 +02:00
Isaac Connor 4b417b8937 Fix other cases of user as an array 2023-04-23 15:35:26 -04:00
Isaac Connor e7f44f2776 fix logic to use count on unviewableMonitorIds 2023-04-23 13:26:03 -04:00
Isaac Connor 141dcc07fe use ajax instead of getJson so we can specify no timeout. Ensure no concurrent ajax queries 2023-04-23 13:15:43 -04:00
Isaac Connor d951173388 Add new lines to thumbnail html 2023-04-23 13:15:11 -04:00
Isaac Connor 969baa3891 Convert user from an array to a User object 2023-04-23 12:57:29 -04:00
Isaac Connor 316c5eda86 Make text inputs wider on options 2023-04-23 12:57:07 -04:00
Isaac Connor e3a77876c0 Remove deprecated code for loading image by path. 2023-04-23 10:27:56 -04:00
Isaac Connor 7b2dcc2ea8 user->MonitorIds no longer exists 2023-04-22 21:32:53 -04:00
Isaac Connor 6d88b3b90c Add scanNetwork button 2023-04-22 16:59:59 -04:00
Isaac Connor 483b658622 Fix const curWidth. Fixes #3690 2023-04-22 16:45:30 -04:00
Isaac Connor 0bce4e190e Fix eslint 2023-04-22 14:06:00 -04:00
Isaac Connor 35cc9fa4cb Apparently Default for Deleted needs to be zero, not false 2023-04-22 14:04:18 -04:00
Isaac Connor 665628720f Improved setting of Manufacturer and Model, add Status to monitor view status, new defaults for Label, EncoderParamters, don't save analysis jpegs by default and only analyze on 2fps and set a reasonable MaxImageBuffer 2023-04-22 13:58:33 -04:00
Isaac Connor 5f8c80698e Improve Ubiquiti snapshot jpeg support 2023-04-22 13:32:42 -04:00