3f6efbd7ac
add a call to streamPlay to manage play/pause button
2023-05-04 12:50:55 -04:00
6a86fbbd32
Hide/show play/pause instead of having both be there
2023-05-04 12:09:38 -04:00
8f8e770ee4
Make events table cookie last for a day instead of 60s
2023-05-04 12:09:17 -04:00
00113208bf
fix typo
2023-04-28 08:44:47 -04:00
8c409fd7ff
Move checkbox column to the left, main buttons to top, add icons on groups list
2023-04-28 08:29:59 -04:00
0f847f87f8
put event thumbnail in a div with fixed height to fix zoomed image going absolute
2023-04-27 13:46:41 -04:00
3ed6be9327
Use flexbox instead of floats on montage to layout better
2023-04-27 10:44:43 -04:00
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
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
bac1974974
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-26 14:54:09 -04:00
bf113217f2
Improve Axis detection
2023-04-26 14:15:08 -04:00
7825957114
Only set val from cookie if it is non-empty
2023-04-26 11:07:17 -04:00
886bac0888
When zooming thumbnails make them go absolute so they are not clipped by the container
2023-04-26 07:45:09 -04:00
d3bb2144f5
Set height on thumbnail container div to prevent row from collapsing when thumbnail goes absolute
2023-04-26 07:44:15 -04:00
ac3f26f3a3
Only count non deleted Monitors
2023-04-26 07:41:19 -04:00
e4346aeb9d
Add Server Id column
2023-04-26 07:40:48 -04:00
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
0d65281b24
Update users list to use User class instead of sql. Remove Monitors column
2023-04-25 14:01:14 -04:00
d2fb365fa9
Add the ability to send a single summary email instead of individual emails per event
2023-04-24 17:53:16 -04:00
49014ac7fa
replace MonitorIds with viewableMonitorIds
2023-04-24 13:53:14 -04:00
e754c2093d
Fix another user as array use
2023-04-24 13:09:40 -04:00
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
7a0e6cfb42
Move events thumbnail to left
2023-04-24 10:30:35 -04:00
dd064f606a
Fix two straggling array uses of user
2023-04-24 10:16:46 -04:00
606c52ccec
Fix missing ZM on Warning
2023-04-24 10:14:03 -04:00
c87316d3a1
Handle not being logged in
2023-04-24 10:13:45 -04:00
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
c78dc56822
Add 270px (1080/4) as an option to heights
2023-04-23 17:29:53 -04:00
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
4b417b8937
Fix other cases of user as an array
2023-04-23 15:35:26 -04:00
e7f44f2776
fix logic to use count on unviewableMonitorIds
2023-04-23 13:26:03 -04:00
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
d951173388
Add new lines to thumbnail html
2023-04-23 13:15:11 -04:00
969baa3891
Convert user from an array to a User object
2023-04-23 12:57:29 -04:00
316c5eda86
Make text inputs wider on options
2023-04-23 12:57:07 -04:00
e3a77876c0
Remove deprecated code for loading image by path.
2023-04-23 10:27:56 -04:00
7b2dcc2ea8
user->MonitorIds no longer exists
2023-04-22 21:32:53 -04:00
6d88b3b90c
Add scanNetwork button
2023-04-22 16:59:59 -04:00
483b658622
Fix const curWidth. Fixes #3690
2023-04-22 16:45:30 -04:00
0bce4e190e
Fix eslint
2023-04-22 14:06:00 -04:00
35cc9fa4cb
Apparently Default for Deleted needs to be zero, not false
2023-04-22 14:04:18 -04:00
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
5f8c80698e
Improve Ubiquiti snapshot jpeg support
2023-04-22 13:32:42 -04:00
68370a1f88
Add Group to filters, add Notes to widgets, other fixes to widget structure. Add cookie support for widgets.
2023-04-22 10:56:34 -04:00
d9f5d3c357
Implement StartDateTimeSecs
2023-04-22 10:48:41 -04:00
312d0ba841
Use objdetect as thumbnail if it exists.
2023-04-22 10:47:33 -04:00
1638869982
If mp4 is not found, look for any other mp4s to use. Handles care where db has not been updated
2023-04-22 10:30:25 -04:00
c36be30e2a
Rough in an image proxy
2023-04-22 10:29:27 -04:00
d1543f7dd9
Fix missing )
2023-04-22 09:37:53 -04:00
4d8d4b6ee5
Update add_monitors to make it scan the network.
2023-04-21 17:52:14 -04:00
e4509a54ce
Move form control search box font fix to skin so it affects everywhere
2023-04-21 17:51:44 -04:00
0480a745d8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-21 17:37:44 -04:00
9102389394
Remove debugging from font loading
2023-04-21 17:33:14 -04:00
343dd7006c
Fix ESLint errors
...
GitHub web editor adds tabs when it autoformats code,
2023-04-20 00:44:04 -06:00
7a7c57f4d4
Update monitor.js
...
Fix indentation.
2023-04-20 00:39:42 -06:00
ad6f93d6d8
Update monitor.js
...
Hide Janus RTSP Timeout when use Janus is unchecked.
2023-04-20 00:36:04 -06:00
94ef0939ba
Add Deleted=false to sql loading monitors
2023-04-19 18:57:11 -04:00
02046b9c88
Use object methods to load monitor and delete it
2023-04-19 18:56:52 -04:00
73548dda73
Add Deleted member
2023-04-19 18:56:29 -04:00
6a2d28d92f
If Monitor is deleted, don't show event
2023-04-19 18:56:19 -04:00
daa47f4eac
views/monitor.php: Add back h264 NVMPI decoder
...
While moving decoder selection to be configuration based, the NVMPI based
H264 decoder was missed: add it back.
Fixes: 5027bf207
2023-04-18 18:02:48 +02:00
2c2b0a4c30
Add current setting for analysing and recording to Function column
2023-04-13 17:08:13 -04:00
2447f6e0db
Fix wrong number of parameters when using text search
2023-04-13 13:27:20 -04:00
ad89fe94ac
If holding ctrl when clicking zoomout button, zoom out all the way
2023-04-13 12:25:50 -04:00
8a434c95fc
Fix checkbox column still being on the right in the footer
2023-04-13 12:25:26 -04:00
1f11493266
Don't need to add auth_hash if we have auth_relay
2023-04-13 10:13:27 -04:00
50be9b6bf1
Allow table to have 200 rows instead of 100.
2023-04-13 10:13:06 -04:00
036091d7e1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-11 12:12:09 -04:00
1fcb29bbba
Fix the auto population of ControlAddress with user:port@ip
2023-04-11 12:12:04 -04:00
1f87eddd48
Cast event counts to int so that they say 0 instead of null
2023-04-11 08:22:18 -04:00
08e315c25d
Fix unmatched}
2023-04-11 07:55:23 -04:00
6fd46c54d5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-11 07:54:02 -04:00
240333381a
Handle val and cnj not being specified. Add Notes to attr that must be non empty
2023-04-11 07:53:55 -04:00
22bca46921
When viewing events with no startdate add a blak StartDate filter
2023-04-10 18:09:29 -04:00
74409daec4
Fix 5MP resolution
2023-04-10 14:20:53 -04:00
b85b7e462e
When testing ZM_ALARM_ON_SOUND, use string comparison as the config value is a string. Also add log if other config options are not set
2023-04-10 13:13:36 -04:00
aff74f0dab
Add text spans on buttons so we could hide text if we wanted to
2023-04-10 10:49:26 -04:00
e447137bf9
Define ZM_DIR_SOUNDS on montage
2023-04-09 08:58:28 -04:00
8dcc767af1
Split button bar into three sections, adding a right button bar and make it flex. Add right buttons to do sorting instead of using an image in each row. Move the Id column to the left for consistency and good UI.
2023-04-07 13:27:20 -04:00
75d9d9ad9b
Fix eslint
2023-04-07 12:09:01 -04:00
92f8adb654
Fix eslint
2023-04-07 12:08:18 -04:00
7b3a613474
Merge pull request #3685 from Simpler1/shift-delete-event
...
feat(event): Shift delete with no confirm
2023-04-07 12:03:55 -04:00
26d39dcde6
feat(event): Shift delete with no confirm
2023-04-07 12:00:53 -04:00
e0dd6ccca2
feat(event): Shift delete with no confirm
2023-04-07 11:26:32 -04:00
b2fe561608
Merge pull request #3682 from Simpler1/alarm-sound
...
fix(alarmSound): Use Audio.play() for alarm sound
2023-04-07 11:17:14 -04:00
977f392ffb
Merge pull request #3684 from Simpler1/shift-delete-watch
...
feat(watch): Shift delete with no confirm
2023-04-07 11:16:08 -04:00
0a84cd0327
fix(alarmSound): Use Audio.play() for alarm sound
2023-04-07 10:55:09 -04:00
d4b9982584
feat(events): Shift delete with no confirm
2023-04-07 10:54:15 -04:00
4b0a6e1cb0
feat(watch): Shift delete with no confirm
2023-04-07 10:53:11 -04:00
2343a42eea
Add Resolution to event stats
2023-04-06 19:03:40 -04:00
37c1b923bb
Update var=>const, and add detection of unapplied scale to image stream, and re-apply
2023-04-06 19:03:24 -04:00
1ada7d7504
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-06 15:16:12 -04:00
01b886ef49
Add scale to status and fix cast on elapsed
2023-04-06 15:15:36 -04:00
a256056d0a
All float values in various fields
2023-04-05 17:50:56 -04:00
ce0a83f904
Reduce minimum to .05% as that is what seems to be necessary these days
2023-04-05 17:47:03 -04:00
394cd6e0f8
AlarmRGB should be an actual hex value not a string
2023-04-05 17:46:29 -04:00
23fb13f660
Show streams even if not running, since they may be on a different server
2023-04-05 17:46:08 -04:00
21f6bdae35
Change minimum percent to 50% instead of 3%
2023-04-05 14:46:13 -04:00
d170112ef7
Change minimum percent to 50% instead of 3%
2023-04-05 14:45:30 -04:00
b1df318491
Use ORM Zone Object for Zone insertion on new monitor
2023-04-05 14:43:50 -04:00
231b0ab631
Sync up default values with what gets added in actions/monitor
2023-04-05 14:42:44 -04:00
48067542f9
Limit progressbar to 100%
2023-04-05 08:59:16 -04:00
9284ae2908
Add Name,Email,Phone to User object
2023-04-03 12:45:09 -04:00
edaec97895
Move buttons to header
2023-04-02 18:17:03 -04:00
df2828ecba
Make new header div flex and align contents
2023-04-02 18:16:51 -04:00
7616898579
Add class to side navbar to so can hide entries there too
2023-04-02 17:20:37 -04:00
6bc2d525d5
Add the config item name to the div so we can hide them if we want
2023-04-02 16:52:08 -04:00
44ebd80334
Parse and substitute events numbers with a link to the event.
2023-04-02 16:38:02 -04:00
e739cc2a34
Remove debug
2023-04-02 16:28:42 -04:00
7e00621e27
Make events column headers links too
2023-04-02 16:28:23 -04:00
c23469e3eb
limit height of filter inputs because chosen multi-select can get too tall
2023-04-02 16:28:05 -04:00
aaf5f4f207
Use val() on the select instead of trickery to get the array of selected values
2023-04-02 16:27:39 -04:00
3a20ab64c7
Turn dropdowns into chosen multiple-selects
2023-04-02 16:27:14 -04:00
d5baadca84
Comment out debug
2023-04-02 16:10:24 -04:00
86768d108a
Fix values not being used in log query causing errors when level filter isused
2023-04-01 09:41:37 -04:00
6b0fb7304a
Improve styling of monitors, making monitors list comma separated instead of br and make them links to monitor edit.
2023-03-29 11:58:55 -04:00
e0c1aeb823
Use jquery text() instead of DOM innerHTML to change icon
2023-03-28 18:09:04 -04:00
db58e9f7ef
Use alt and title tags on frame images
2023-03-28 16:35:20 -04:00
06cad49b80
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-03-28 16:34:05 -04:00
ca0f04f3a7
Fix assignment to const
2023-03-28 16:31:33 -04:00
aff04e3230
Remove width spec from objdetect image when viewing fullscreen
2023-03-26 10:50:11 -04:00
8f96f7de8b
fix lack of scroll in event view
2023-03-26 10:28:18 -04:00
593c7ac902
Handle HomeView not being set, and default it so that it is set
2023-03-24 12:53:49 -04:00
16b74fc474
Add title of monitor id and name like we had in 1.36
2023-03-23 20:03:40 -04:00
dd6cc74da7
Rough in UserPreference api
2023-03-22 13:22:08 -04:00
764d48d378
If the css in cookie is invalid, clear it so that the logs don't fill up with the warnings
2023-03-22 08:06:02 -04:00
6c8a2ad05a
add support for shortened user= pass= which is used in auth_relay=PLAIN
2023-03-22 08:06:02 -04:00
da87187f1d
Use explode instead of split
2023-03-22 08:06:02 -04:00
01ba5f59f9
Use dirname(__FILE__) instead of DOCUMENT_ROOT. Apparently many people have something wrong in DOCUMENT_ROOT. I don't understand it, but it seems like dirname(__FILE__) is a better solution anyways.
2023-03-21 18:22:53 -04:00
34e3e99c99
Rough in code for User_Preferences
2023-03-21 10:03:57 -04:00
cd167d8aec
Fix eslint
2023-03-21 10:02:53 -04:00
e60586feee
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-03-21 09:54:40 -04:00
128b3d884a
Spacing
2023-03-21 09:54:37 -04:00
e216b6b008
Add auth_relay to stream status request so that it works when AUTH_RELAY=PLAIN
2023-03-21 09:54:22 -04:00
a1c732abb8
Add special case, when the filter specifies a single event, modify the filter to be a Monitor filter so that next and prev buttons work
2023-03-21 09:53:52 -04:00
7a254b42f5
Fix use of auth_relay when PLAIN
2023-03-21 09:52:50 -04:00
a45fc576c9
Improve detection of codec playability. Basically just look for h264
2023-03-21 08:21:20 -04:00
766cdcde9e
Add auth_relay to cycle urls so that auth works on cycle view
2023-03-19 11:31:44 -04:00
8bef309a86
Values in terms are comma separated, so split the val for Monitor selection
2023-03-16 08:43:01 -04:00
97879eab49
Fix missing s causing problems when Group permission set to None
2023-03-08 10:59:33 -05:00
06f750c42b
add in is_isnot_opTypes and booleanValues and use them in simple_widget
2023-03-05 13:26:08 -05:00
ed9f02d4b0
show icons even if loading times out
2023-03-05 12:54:08 -05:00
3431a82f76
Add classes to option rows so we can style them individually
2023-03-05 10:57:35 -05:00
065464a7f8
Use new getHomeView function instead of view=console
2023-03-05 10:21:59 -05:00
4c586b67ba
Fix include from api to users for users tab
2023-03-05 10:21:39 -05:00
3e86454fc6
implement getHomeView function
2023-03-05 10:21:18 -05:00
aac9c644fb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-28 14:06:16 -05:00
6000ceaf2e
Add Name, Email, Phone to user edit
2023-02-28 14:06:00 -05:00
18403bf33e
Move users list from options into an include. Add Email, Phone, Name fields
2023-02-28 13:59:16 -05:00
94efc5ff73
Add fontfaceobserver.js
2023-02-28 13:58:17 -05:00
ecf91ff6a0
Unhide material icons once the font has loaded
2023-02-28 13:58:02 -05:00
ad4bc04bfb
Hide material icoins until font is loaded.
2023-02-28 13:57:46 -05:00
d75364ff53
Need to always include auth.php, as it has functions like canView
2023-02-27 17:02:23 -05:00
2e58ea1a42
return false if not logged in in canView. defaultUser is global, need to tell it so.
2023-02-27 17:01:58 -05:00
82491b3d81
Addd server_stats route
2023-02-27 10:59:14 -05:00
1e75ab7541
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-26 17:04:09 -05:00
8a6f0cbe1b
Add ServerStats to api
2023-02-26 17:04:05 -05:00
5027bf207e
add h264_mmal as a decoder option
2023-02-26 16:30:31 -05:00
72652cfb64
Add Decoder options to monitor view
2023-02-26 16:04:32 -05:00
af6e38caf0
Merge branch 'master' into patch-2
2023-02-26 10:14:35 -05:00
6505bba826
Add qsv codec options
2023-02-25 19:00:31 -05:00
1cdd1325bf
Fix eslint
2023-02-25 16:26:19 -05:00
79d19c21d1
Update validating access to Monitors, using canView due to Monitor and Groups permissions
2023-02-25 16:13:39 -05:00
9ceb22db8f
Fix auth for monitor_permissions...
2023-02-25 16:00:34 -05:00
9fe1e507c7
fix scroll bars on user edit when sticky headers
2023-02-25 15:54:42 -05:00
84383a0498
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-25 13:17:53 -05:00
3cda5ab235
Include map.js
2023-02-25 13:06:17 -05:00
afcf55608e
Move map generation into an Object so it can be reused.
2023-02-25 13:04:49 -05:00
155502ee32
Must include Storage.php
2023-02-25 13:02:29 -05:00
a7743dd0ed
Add DiskTotalSpace and DiskUsedSpace to returned Storage objects
2023-02-25 13:02:19 -05:00
a7af29c0c4
Add IN operator
2023-02-25 13:00:38 -05:00
0995a44561
Only show Location tab if geolocation is turned on
2023-02-25 12:46:48 -05:00
a2879fb66c
Add Map view to header
2023-02-25 12:46:34 -05:00
b0413f330e
Merge branch 'map'
2023-02-25 12:44:28 -05:00
4979d299a6
Cleanup code style
2023-02-25 12:40:54 -05:00
cbabf9d5ce
Add getFromApi
2023-02-25 12:40:41 -05:00
39de76e989
add a db_version and a feature check function to determine if we support skip locks in the query. Use it to disable the feature in filter view.
2023-02-25 11:44:50 -05:00
82a28b78d8
Use function style of member access to prevent errors on unsaved monitor
2023-02-23 13:22:50 -05:00
6867b0c841
Correct the syntax of the CSP
2023-02-23 09:47:49 -05:00
32afb13b39
Sanitise attr input in FilterTerm to prefent SQL Injection. Fixes GHSA-222j-wh8m-xjrx
2023-02-23 09:25:03 -05:00
7b36027066
add in files actions, with delete
2023-02-22 05:59:16 -05:00
4a19b4ec05
Scale the thumbnail, not the full view
2023-02-21 14:26:37 -05:00
d6dc1d3e30
Add object-src CSP directive
2023-02-20 18:15:16 -05:00
44c7582003
Don't shorten analysis
2023-02-20 17:30:48 -05:00
d073ba37ba
Default to Monitor->DefaultScale instead of 100% scale.
2023-02-20 15:42:30 -05:00
bfbe0d581b
uncomment out the mintime and maxtime validations. They were commented out for some quick testing.
2023-02-20 12:27:16 -05:00
119e4e6756
use detaintPath on modal to prevent including other files instead of real modals
2023-02-20 11:58:10 -05:00
4067151fd8
Check for valid date in minTime and maxTime to prevent SQL attack
2023-02-20 11:54:50 -05:00
8d36edb602
Be more specific about which form we are styling so as not to affect modals
2023-02-20 11:54:29 -05:00
4f66ab3503
Introduce check_datetime function to validate dates
2023-02-20 11:53:53 -05:00
00234fbb20
Attempt to sanitize daemon and arguments before executing commands to prevent executing other programs.
2023-02-20 11:53:32 -05:00
82a9d6d444
Use validCardinal on Id to prevent executing other commands
2023-02-20 11:41:41 -05:00
d6575cdec3
Adjust size of text inputs MonitorName and Source Path Filters to match chosen inputs
2023-02-20 10:36:13 -05:00
f4a2925177
Test for valid monitor id in snapshot creation.
2023-02-20 10:30:34 -05:00
bf810ec8c4
test for existence of username in session to prevent error outputs
2023-02-20 10:20:59 -05:00
80797e97d7
Move actions process to after the unauth check. In the past the action did the logging in but that is no longer the case. We can now assume in actions that the user is at least logged in.
2023-02-20 10:16:44 -05:00
3268f95282
Fix detaintPath not stripping sequences like ..././
2023-02-20 09:18:51 -05:00
2ec375d51c
Default to auto instead of 100% scale.
2023-02-19 17:29:32 -05:00
74a0790c56
Use const instead of var, code comment fix
2023-02-19 17:29:32 -05:00
3803a872fc
Replace some vars with const or let
2023-02-19 17:29:32 -05:00
5090000cdd
Remove ZM\s that shouldn't be there
2023-02-19 17:29:32 -05:00
74b8bf3a2a
decodeURI when taking password from uri. Always update username/password.
2023-02-18 18:02:15 -05:00
2412fefdf5
Bump firebase/php-jwt from 5.0.0 to 6.0.0 in /web
...
Bumps [firebase/php-jwt](https://github.com/firebase/php-jwt ) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/firebase/php-jwt/releases )
- [Changelog](https://github.com/firebase/php-jwt/blob/main/CHANGELOG.md )
- [Commits](https://github.com/firebase/php-jwt/compare/v5.0.0...v6.0.0 )
---
updated-dependencies:
- dependency-name: firebase/php-jwt
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-17 14:54:52 +00:00
a2e9cc23cb
Set a short expiry 1min and set the cookie name to include the filter so that each and every filter gets it;s own pagination saved. Fixes #3510
2023-02-16 14:10:41 -05:00
ee89169a7b
Use reload instead of restart on zone save
2023-02-16 14:10:30 -05:00
855ab6f141
Add reload to monitor zmcControl
2023-02-16 14:10:21 -05:00
f044d04271
Stop streams when clicking cancel/Save so that we don't log errors trying to access a dead zms. Fixes #3643
2023-02-16 14:10:12 -05:00
1a8a84da96
Remove debug when relay not hashed
2023-02-15 15:02:22 -05:00
8ec5946791
Add backtrace to value not in values warning
2023-02-15 15:02:11 -05:00
c009ef1bbe
Fix AlarmFrames validity test
2023-02-15 15:00:23 -05:00
71265a8271
Define serversr, stats for simple widget
2023-02-15 15:00:13 -05:00
113171e5ee
username in session can also be unset
2023-02-15 13:46:34 -05:00
ff528e578f
Show 0 instead of null in storage disk used column
2023-02-15 11:00:59 -05:00
1e77b58409
Don't set NextTimeStamp when we have a change of event.
2023-02-15 11:00:33 -05:00
30a75d81d2
Turn off debug, fix frame->frames typo
2023-02-15 10:24:45 -05:00
1a215dab3e
Handle no frames in data gracefully
2023-02-15 10:20:59 -05:00
e31fa4a4c3
Clear action when loading events.
2023-02-14 17:56:55 -05:00
40e7f8a517
Handle SESSION[password] not being set which happens when you switch AUTH_RELAY to plain.
2023-02-14 17:10:58 -05:00
29b688a2a5
Fix storageareas not being defined.
2023-02-14 17:05:20 -05:00
1fa0253fa5
When switching from hashed to plain relay, the session won't have password. So prevent errors.
2023-02-14 17:04:32 -05:00
dedff86511
Allow caching of images
2023-02-13 16:15:12 -05:00
50b462b3a0
Use scaled images when displaying alarm and objdetect images
2023-02-13 16:02:36 -05:00
ccc4588c99
Don't include Server column if there is only 1
2023-02-10 16:57:38 -05:00
14bfe38778
Fix eslint
2023-02-10 13:49:01 -05:00
91de85285c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-10 13:02:54 -05:00
86f63a9c01
remove extra p tag and reduce php tags
2023-02-10 13:00:46 -05:00
ce45783812
Fix infinite when page > 1 and there are no results.
2023-02-10 12:31:43 -05:00
30617fbadd
Refresh logs results after a date is chosen, not on each and every alteration to the hour/min/sec etc
2023-02-10 09:56:37 -05:00
d52d727256
Use const instead of var
2023-02-09 18:46:01 -05:00
ebb37ebc98
Don't output errors from remote commands as it breaks ui
2023-02-09 18:46:01 -05:00
357ce14c94
format endtime
2023-02-09 18:46:01 -05:00
8af3397f87
Fix errors when Path isn't parseable and add initial probeUbiquiti function
2023-02-08 13:19:18 -05:00
0589ec29c4
Add percentage used to storage listing
2023-02-07 11:52:54 -05:00
0462efdef0
Don't strip tags from log Message. It removes anything involving > OR <
2023-02-07 10:54:25 -05:00
a2ab907c92
Spacing, parenthesis and use Id() instead to avoid warning when called on a non-existent monitor
2023-02-07 09:11:29 -05:00
6281cbc623
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-07 09:00:49 -05:00
a592dfb8aa
Put alarm cues at the bottom of video area instead of overlapping progress bar.
2023-02-02 18:47:37 -05:00
b239109d72
Add navbars and password visibility to onvifprobe
2023-02-02 17:22:50 -05:00
2f06f67a95
Fix wrapping on cycle sidebar on watch
2023-02-01 18:40:21 -05:00
69c67bcc09
Fix eslint
2023-02-01 14:51:25 -05:00
55041043f2
Put back to 3.0
2023-02-01 14:34:05 -05:00
0d1e9c8d41
Try another way to prevent autofill
2023-01-31 13:30:59 -05:00
ce06badc80
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-31 11:38:11 -05:00
843805f852
Increase redness of alarm cues and make progress indicator yellow
2023-01-31 11:37:48 -05:00
9f75de73c8
Remove z-index: -1 which causes things to not be clickable
2023-01-31 11:37:48 -05:00
e411cf53a5
center events lists
2023-01-31 11:37:48 -05:00
9666244fa6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-31 09:04:51 -05:00
700c672cbd
update ZM_TARGET_DISTRO description
2023-01-29 14:49:54 -06:00
689ae56732
Sync up tags with collapsed header and remove the fixed-top class so that the stick header takes over.
2023-01-29 10:54:47 -05:00
b3029a3dad
Cleanup and remove the Capturing=None filter. Should still be able to view events for a monitor that is NOW disabled.
2023-01-27 16:58:01 -05:00
bbdfd0ddf0
Remove some cruft
2023-01-27 16:57:26 -05:00
5bf89b7178
Set width of UUID field and move labels to the left on mobile
2023-01-27 15:52:13 -05:00
3b5ceaddef
add version and telemetry tabs to options
2023-01-27 15:51:50 -05:00
d04b9891f1
Just do the symlink, there is a race between file_exists and symlink
2023-01-27 15:50:50 -05:00
bfe7b056b8
Add alarm,snapshot, objdetect thumbs to event view
2023-01-27 15:49:49 -05:00
49885c3b9c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-25 16:41:11 -05:00
047d1fb4e8
Fix missing / on close li tags
2023-01-25 16:39:05 -05:00
79d3d05060
Remove brackets and add and cnj for default filters. Use Event Loading SQL similar to other views, allowing filtering by monitor Name etc. Remove specific Archive filter.
2023-01-25 13:27:55 -05:00
4826b2edf4
Make monitor filters flex, and wrap when on mobile
2023-01-25 13:26:47 -05:00
c8e4dcbe51
Add valid case for Archived
2023-01-25 13:25:33 -05:00
ecf790b1d6
Diskspace(null) updates the db record so no need to call save as well
2023-01-25 12:27:59 -05:00
1658164ee1
explode the val in term for Monitor rule type. It will be a comma separated value, not an array
2023-01-25 11:50:16 -05:00
d6de278070
Only add filter terms if not in live mode. Use filter sql instead of manual rules
2023-01-25 11:50:16 -05:00
c48fc3ce6e
Define events even if sql fails
2023-01-25 11:50:16 -05:00
6f991d81ea
Go to history mode when viewing matches
2023-01-25 11:50:16 -05:00
031f5fe6f4
Don't output preg_match errors
2023-01-25 11:50:16 -05:00
874119c04d
Event->Diskspace(null) automatically updates the db. So don't do a second save
2023-01-25 11:50:16 -05:00
d5d5f33806
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-25 11:42:01 -05:00
774c963810
Merge branch 'master' of ../otherbranch
2023-01-25 11:41:52 -05:00
fe95e5b2bc
Add valid test case for AlarmFrames
2023-01-25 11:41:38 -05:00
fd327d9b91
Replace hr with borders. Make all content scrollable fixing buttons being off screen. Shrink labels on mobile
2023-01-24 21:33:42 -05:00
56dea17703
Fix issues with removing minTime and maxTime
2023-01-24 21:33:32 -05:00
caf6fc2528
Merge branch 'master' of ../otherbranch
2023-01-24 21:31:45 -05:00
4d543073ec
disable minTime and maxTime inputs, in favour of filter versions
2023-01-24 21:31:30 -05:00
b9c3be907c
Merge branch 'master' of ../otherbranch
2023-01-24 21:23:42 -05:00
86d1ac81e6
Use 'Y-m-d H:i:s' for formatting as datetimepicker doesn't want timezone. Use Filter object methods instead of arrays. Usse Monitor instead of MonitorId in filter so that widget looks better
2023-01-24 21:23:31 -05:00
d2a6c83056
Merge branch 'master' of ../otherbranch
2023-01-24 21:17:45 -05:00
1431eca868
Remove stripslashes when saving config values. The values in REQUEST have not been escaped, so stripslashes is not appropriate. Fixes #3655
2023-01-24 11:47:31 -05:00
9e46cc598e
Apply chosen styles to dropdowns in Options
2023-01-24 10:42:47 -05:00
5e71a8fb72
Add operator filtering to has_term
2023-01-21 18:41:11 -05:00
9789e02f2a
create archiveTypes static function. Use it. Add has_term function
2023-01-21 18:40:44 -05:00
77d27ceccc
Merge ../ZoneMinder.connortechnology
2023-01-21 18:39:53 -05:00
1bfd45ea34
Don't need to call chosen in monitor.js as it is called in body
2023-01-20 14:15:22 -05:00
38853e22d7
Remove uneeded classes and tags
2023-01-20 14:12:19 -05:00
39f2fa5fbb
When auto scaling, if we get a negative new height, just make it 100% width
2023-01-20 14:12:02 -05:00
9479ccae8f
Add scroll bar to watch content when sticky
2023-01-20 14:11:39 -05:00
90388e6483
Spacing
2023-01-20 14:11:19 -05:00
15f1930968
Remove style on chosen selects making them bigger than content
2023-01-20 14:10:02 -05:00
8c62f86797
Add styling for ul/li layout and fix mobile layout. Fixes #3654
2023-01-20 13:49:21 -05:00
df43de9496
replace use of tables for layout with ul/li/label
2023-01-20 13:12:37 -05:00
a0bbdfc140
Add flip to watch
2023-01-19 17:07:48 -05:00
d6e3a325aa
Remove dropdown class from menu items that aren't dropdowns
2023-01-19 17:07:48 -05:00
21bc35f4d2
Override portrait menu styles so that the menus look good on mobile
2023-01-19 17:07:48 -05:00
6fa39d25c1
Separate account status section.
2023-01-19 17:07:48 -05:00
4b7680bc43
Use & instead
2023-01-19 17:07:47 -05:00
382e9840ca
Make chosen work on mobile https://realize.be/blog/mobile-support-chosen
2023-01-19 17:07:47 -05:00
0fd9ca00d0
Make #header always 100% no matter responsive width
2023-01-19 17:07:47 -05:00
1469562927
Fix bulk frame adjustment doing string concat instead of integer addition
2023-01-18 10:08:33 -05:00
aa3bc1a28d
Add TimeStampSecs to fields returned for Frames.
2023-01-18 10:07:41 -05:00
1a4c349505
Need height: 100% to make logsTable div take up the space and show scrollbar
2023-01-17 20:05:10 -05:00
Isaac Connor
Isaac Connor
stefan
baudneo
AngeloGioacchino Del Regno
Simpler1
dependabot[bot]
Andrew Bauer