add08aeb56
Add 5MP resolution
2023-07-21 14:30:10 -07:00
2fb0b4476b
add mac to probe results
2023-07-21 14:26:56 -07:00
c0b5bbf8cc
Rough in Hanwha support. Fix results getting overwritten
2023-07-21 14:26:39 -07:00
c949b9e2d6
fix(event): Honor the Alt key with left/right arrow
...
Fixes a race condition when using Alt-LeftArrow to go back to the previous page (standard browser behavior).
Sometimes it would go the previous event and sometimes it would go to the previous page. Now it will consistently go to the previous page when the alt key is pressed with the left arrow.
2023-07-21 15:07:22 -04:00
10f7e4320f
fix(cookies): Use max-age instead of expires
2023-07-21 13:27:44 -04:00
ef68943b7c
chore(): Set default cookie time to Jan 2038
2023-07-21 11:07:11 -04:00
6cb4f0a4f6
Fix logic on filtering monitorNames
2023-07-20 16:44:23 -04:00
75322142a4
Remove deprecated MonitorsIds. Replace it's use with looking for edit permission per monitor
2023-07-19 12:39:32 -04:00
cb7d954a87
Fix warning when creating new user
2023-07-17 17:29:16 -04:00
6dbdd2120d
Cleanup mid before use. Mostly to quiet snyk
2023-07-17 17:02:32 -04:00
f46ef094dc
Merge envserv:sandbox/ZoneMinder
2023-07-17 15:37:12 -04:00
65d37e7a36
Rough in a Grandstream detector
2023-07-17 14:36:28 -05:00
64057eec95
ROugh in Foscam and DLink detections
2023-07-15 10:29:54 -04:00
cae8fda326
Remove debug
2023-07-15 10:29:38 -04:00
c7259fdc14
Implement read locks when accessing jpgs. Implement locking on creating scaled jpegs.
2023-07-13 17:20:18 -04:00
d172d41638
Add Capturing=Always
2023-07-13 12:45:25 -04:00
b21b58c5ba
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-12 17:09:51 -04:00
752faf5899
Add ue strict, some speed control functions and fixes for use strict
2023-07-12 17:08:44 -04:00
e13a42aa46
Fix not saving Manufacturer and Model. Have to unset the text input if the ddm is populated
2023-07-12 14:30:49 -04:00
5d21a19231
Merge pull request #3726 from Simpler1/patch-2
...
Remember Events table settings
2023-07-12 10:34:13 -04:00
5a8330ac98
Merge pull request #3727 from Simpler1/patch-3
...
Fix(event): Consistent cookie timeframe
2023-07-12 10:33:18 -04:00
87e493376f
fix(events): Dark background for table while loading
...
When using the dark theme css, as the events table is loaded, the background is a dark grey instead of white.
Previously, the "loading" background color was white which was very jarring for the user as the screen flashes from dark grey to white and then back to dark grey.
2023-07-12 10:28:59 -04:00
e96d2a6acc
No longer abort when sending a command... no streaming ajax should take any significant time.
2023-07-11 17:27:52 -04:00
4f80577d36
Add geolocation to event view
2023-07-10 13:45:12 -04:00
f96ac69033
Set thumbnail image source to stream immediately, then change the class for zoom. Increate timeout to 250
2023-07-09 12:05:18 -04:00
37b571a58a
Handle no password specified and make testing for www-authenticate header non case sensitive
2023-07-05 15:51:16 -04:00
fd39c57038
Use sticky instead of absolute to fix zoomed thumbnails when scrolled
2023-06-28 14:51:32 -04:00
2862f47a8b
Add standard divs and put canvas in the content div so scrolbars work
2023-06-28 14:49:31 -04:00
47ebf929cc
Actualy populate Name, Email, Phone inputs
2023-06-27 11:55:21 -04:00
3714b38caa
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-06-27 11:47:03 -04:00
961f05b228
Don't show deleted monitors in group dropdowns
2023-06-27 10:45:13 -04:00
bc1214e8e5
Don't use empty because it tests for false, and 0 is false. Just check for empty string. Fixes #3732
2023-06-27 10:44:25 -04:00
93dc57401f
Remove duplicated ExistsInFileSystem label
2023-06-26 10:34:19 -04:00
ccdbb8edf6
Improve Avigilon detection
2023-06-22 13:31:01 -04:00
139315776d
Fix searching by monitor name
2023-06-22 13:13:19 -04:00
2f2c488e5a
Merge pull request #3725 from Simpler1/patch-1
...
Fix(monitor.css): Narrow layout for pills-tab
2023-06-20 13:02:43 -04:00
fa68fc3894
Merge remote-tracking branch 'origin/patch-4' into patch-5
2023-06-19 11:36:39 -04:00
2d07098e1b
Add Help text for OPTIONS_ALARMMAXFPS
...
Previously this was pointing to the same text as OPTIONS_MAXFPS.
2023-06-19 11:33:20 -04:00
40a4d5266e
Add Help for OPTIONS_ALARMMAXFPS
...
Pulled text from ReadTheDocs.
2023-06-19 11:29:31 -04:00
80373f8f44
Fix(event): Consistent cookie timeframe
...
Sets cookie timeframe from one hour to two years (consistent with other cookie settings).
2023-06-14 19:23:14 -04:00
4c28b16c4b
Remember Events table settings
...
Fixes #3671
2023-06-14 19:19:58 -04:00
ed1a4c249d
Fix(monitor.css): Narrow layout for pills-tab
...
Fixes issue #3714
2023-06-14 19:13:42 -04:00
87fbc96609
Fix where error_log write to to include path
2023-06-09 19:37:47 -04:00
19128eee18
Do not allow directory names in ZM_LOG_DEBUG_FILE. Only log to ZM_LOG_DIR
2023-06-09 17:27:54 -04:00
8a00be8cc8
Load the ZM::Event using the Event Model data instead of loading by Id which goes back to db.
2023-06-09 10:53:10 -04:00
c811f1bc90
Load event using find_one which does caching.
2023-06-09 10:52:39 -04:00
2cb697f0e9
Debug alarm.jpg path when not found. Spacing. Remove unused Monitor variable
2023-06-09 10:40:34 -04:00
14eb38a00b
add timeout value to debug, only send scale command if it is > 0
2023-06-08 10:30:01 -04:00
59ff7f3a31
Improve logged wrt insufficient permissions
2023-06-08 09:17:16 -04:00
81b9ac5efd
Ignore inherit on monitor permission. We were returning true instead
2023-06-07 16:00:27 -04:00
7a21c01f36
Don't show bandwidth options if there are none to choose from
2023-06-07 16:00:02 -04:00
3dbd68886a
Reload user using zm\User object methods
2023-06-07 15:59:46 -04:00
3491a99fc3
ServerId can be null so must have quotes around it
2023-06-07 11:33:59 -04:00
4f416edf93
Fix missing auth_relay on alarm xhr
2023-06-05 09:57:12 -04:00
28d6a9915c
Fix eslint by finishing the intended code. The idea is to autmatically populate dhcp-range based on the ip set on the interface. This is unlikely to every happen due to defaults. Perhaps the code should simply check for the existence of the specified ip and flag the error
2023-06-04 07:50:29 -04:00
50be49b447
Make objdetect modals 65% width to make it easier to see
2023-06-01 14:49:00 -04:00
5c81538a09
remove fit-content on objdetect modal so we can scale it up to fit the screen better
2023-06-01 14:48:39 -04:00
7f10c7060a
Fix hard coded monitor 5 in Add New Zone button
2023-06-01 07:56:43 -04:00
31d9342918
Assume reverse proxy setup for janus for http as well
2023-05-31 17:01:45 -04:00
993e8806c5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-31 15:04:45 -04:00
8a0c1bc379
Check to see if dnsmasq is installed
2023-05-31 15:04:42 -04:00
42df7c00ea
Fix left alingment of DHCP option
2023-05-31 15:04:04 -04:00
cd4461c5a5
Fix merging config values. Defaults to no, fix parsing config file
2023-05-31 15:03:50 -04:00
bfd86993e7
Add back logging, fix including = in value
2023-05-31 14:52:33 -04:00
43ed5f014f
Put dnsmasq layout options into a dnsmasq class
2023-05-31 12:35:52 -04:00
c3eccb4f96
Fix cspnonce
2023-05-31 12:08:08 -04:00
9141ea786d
left align config
2023-05-31 12:07:58 -04:00
4b82cf1d82
Don't check for file existence, just a value
2023-05-31 11:42:38 -04:00
b54a92da8e
Rough in automatic range setting from interface ip
2023-05-31 11:42:15 -04:00
c02cbd86f8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-31 09:16:32 -04:00
8bd3e5a3b1
Can't use ZM\Logger functions in config as it loads before logger.php.
2023-05-31 09:09:17 -04:00
5fc8bf0743
Any tables with bootstrap-table class gets the bootstrap-table treatment
2023-05-30 20:47:05 -04:00
ee0776c970
If configured, show dnmasq edit UI
2023-05-30 20:47:05 -04:00
7b2d8dc98c
Rough in UI for editing dnsmasq config
2023-05-30 20:47:05 -04:00
d277d6ca53
add formatting for dnsmasq edit
2023-05-30 20:47:05 -04:00
b0e29c9be7
Fix downloading of Ffmpeg type monitors
2023-05-30 20:47:05 -04:00
eab4d95e81
Always return an array from process_configfile instead of false on failure
2023-05-30 20:47:05 -04:00
bc4d625ca4
Add systemd_isactive
2023-05-30 20:47:05 -04:00
febf424259
Fix returning link_to
2023-05-30 20:47:05 -04:00
6204dfdecc
Fix start/stop/restart dnsmasq
2023-05-30 20:47:05 -04:00
30495578c2
Add link_to function
2023-05-30 20:47:05 -04:00
2ac1fa21f8
Start roughing in dnsmasq options
2023-05-30 20:47:05 -04:00
7dbdf47d41
Add dnsmasq tab if it exists
2023-05-30 20:47:05 -04:00
d728385bd1
Put a div around left buttons so we can use flex to lay it out better
2023-05-26 16:48:36 -04:00
66ef087a4d
ServerId and FilterServerId must have a value to be valid
2023-05-26 16:38:58 -04:00
c9a039209d
Only add default value for startdatetime if the filter was empty before adding base terms
2023-05-26 16:37:23 -04:00
51a1d511fb
Fix incorect merging of terms in sort. Fixes #3715 . Also always show text op in simple_widget
2023-05-26 16:36:40 -04:00
e14fc279e4
Handle empty set in IN/NOT IN better
2023-05-26 16:35:45 -04:00
4959d83751
Switch from utf8 to utf8mb4 so that collate works
2023-05-25 17:31:30 -04:00
9a13312e4e
Fix eslint
2023-05-25 14:15:32 -04:00
f49af3ac7b
Fix eslint
2023-05-25 14:10:37 -04:00
99bc3a58f8
Remove md-18 from material icons so we can override the size in css for smaller screens
2023-05-25 13:56:00 -04:00
e527264182
Hide navbars when not logged in and auth turned on
2023-05-25 13:55:39 -04:00
d32f82750f
Put back missing functionality on portrait mobile. Fixes #3712 .
2023-05-25 13:55:20 -04:00
f2b2d37a11
Make all material-icons buttons 18px
2023-05-25 13:54:44 -04:00
84e258c366
Just logically group code
2023-05-24 18:31:34 -04:00
704b3b2a80
Handle missing cnj on terms
2023-05-24 18:30:33 -04:00
a7a8681344
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-24 14:42:55 -04:00
ad24bd8eb1
Handle failure to db query more gracefully
2023-05-24 14:42:47 -04:00
b7a2afcaee
(fix): Montage 2 wide is stable on Chrome during alert
...
bootstrap has in internal css class called .alert that interferes with ZoneMinder's .alert class.
This fix overrides the bootstrap class and sets padding to 0.
2023-05-24 14:32:54 -04:00
52621c4314
Transform date string to int to satisfy newer php
2023-05-23 18:37:59 -04:00
f24a48a71f
Cleanup code, filter out invalid terms, use filter methods instead of parseTree methods to build sql. Use 1 db hit to load frame data
2023-05-23 16:54:19 -04:00
d4a4bd6c8e
Add remove_invalid_terms
2023-05-23 16:53:52 -04:00
20b7624da0
Handle op not being specified
2023-05-23 15:51:35 -04:00
9fdb3d1876
Don't use parsetree to sql, just go straight to sql
2023-05-23 14:32:51 -04:00
de711e39ae
Always include an and cnj
2023-05-19 12:44:23 -04:00
fa844e60cb
Don't remove cnj on first term in Query. We might reorder them later.
2023-05-19 12:44:08 -04:00
e0c5382825
Get rid of colour white specification on the table
2023-05-19 10:55:31 -04:00
90e4e2b58b
Add icon to AddNewZone Button and icon to delete button.
2023-05-18 13:27:37 -04:00
a76daecc52
Hide button text and hide some columns on console when on phone in portrait mode
2023-05-18 09:16:38 -04:00
af3849ad7f
Always show Group, Monitor, StartDateTime, EndDateTime.
2023-05-17 14:36:59 -04:00
fbe954473a
Add support for placeholders, cookies, case insensitive search and Group as an attr.
2023-05-17 14:36:38 -04:00
91541aa6b7
Add support for placeholders, cookies, DateTime fitler, Notes, Group. Add sort_terms function.
2023-05-17 14:36:09 -04:00
56a12b4308
Make sure nav column doesn't wrap
2023-05-17 08:58:55 -04:00
485af42a0b
Fix more typos
2023-05-16 14:18:26 -04:00
030d6b9696
Fix undefined mid
2023-05-16 14:14:34 -04:00
3daee34d4d
Fix typo
2023-05-16 14:11:53 -04:00
c8c4b560af
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-16 14:11:21 -04:00
6eb166c938
Handle matches2 not being defined
2023-05-16 11:53:48 -04:00
ea37449023
Add auth_relay to control command
2023-05-16 11:53:34 -04:00
22bd680e40
FIx ::
2023-05-16 10:23:39 -04:00
fc90d7bc2b
Remove debug
2023-05-15 16:08:51 -04:00
9e007ea8d7
Shorten inputs on filter to make them fit
2023-05-15 12:45:10 -04:00
d189d820a8
Don't log errors from port_open, don't close the unopened fp
2023-05-15 10:47:54 -04:00
586fd5edb7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-15 10:05:13 -04:00
847e803e82
If failed to open image, send a test jpeg explaining
2023-05-15 10:05:06 -04:00
6dd9473e71
Reorder inputs, works better on mobile
2023-05-15 10:04:36 -04:00
37e711d684
Add port_open function, improve Ubiquiti probing, check for open port on 554 before saying it's a camera
2023-05-15 10:03:34 -04:00
6046398981
Add event Name to the event detail modal
2023-05-12 15:15:55 -04:00
df983039c4
Add an import modal for use in add_monitor view
2023-05-12 15:14:46 -04:00
3436999665
Populate EndTime when NULL. Deal with case insensitive LIKE searching
2023-05-12 15:13:48 -04:00
3009c4902d
Use User object find instead of raw sql
2023-05-12 15:11:40 -04:00
54373e4e85
It is not necessary to escape the field as cakephp will do it for us
2023-05-12 15:07:28 -04:00
494be9c0ef
Add named parameter filtering to Storage controller
2023-05-12 14:10:53 -04:00
4472269f3c
Finish roughing in UserPreference in api
2023-05-12 14:10:53 -04:00
0d561bbf73
Add StartTimeSecs and EndTimeSecs to returned data in Event
2023-05-12 14:10:53 -04:00
d0fead5b06
Add setMaxFPS and fix streamCommand so that data doesn't pollute other commands data
2023-05-12 14:10:52 -04:00
dcf551ff69
Make form 100% so that scroll bar appears
2023-05-12 13:38:03 -04:00
ef424a39b6
Improve Amcrest detection with snapshot image. Fix using auth from monitor overriding other cameras
2023-05-12 13:15:55 -04:00
6014032cc8
Fix layout on add monitors
2023-05-12 13:02:33 -04:00
d522ef677a
Add Avigilon, loading of arp-scan oui database and showing of all devices instead of just recognized cameras. Remove the : from mac addresses to match OUI dbs
2023-05-12 12:59:53 -04:00
51755b4f4e
Fix updating having Id in it
2023-05-12 12:56:36 -04:00
e1c3584462
Add support for HTTP_X_FORWARDED_FOR instead of REMOTE_ADDR. Comment out debugging
2023-05-12 12:53:26 -04:00
d0b8018d9c
Add setting of User Name
2023-05-12 12:52:51 -04:00
7dd09ea55e
When killing stream, stop and abort
2023-05-12 12:50:35 -04:00
81fd2dcb08
Don't pollute streamCmdParams
2023-05-12 12:48:31 -04:00
c4c3dddbe3
add in setMaxFPS
2023-05-12 12:46:16 -04:00
995954db3d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-12 11:35:21 -04:00
85fd53a21d
fix(sound): Alarm sound for zone & zones views
2023-05-12 11:22:25 -04:00
e69dc8fd12
Handle missing toggleZonesBtn
2023-05-12 09:10:36 -04:00
6e8347c693
Use viewableMonitorIds instead of deprecated MonitorIds
2023-05-12 08:59:36 -04:00
4610734109
feat(event): Add keyboard control
2023-05-11 14:01:30 -04:00
9fbf140fc3
fix eslint
2023-05-11 10:23:12 -04:00
a31887634a
Inlcude port in url to janus
2023-05-11 10:23:04 -04:00
241667340d
Add server_id to monitorData
2023-05-11 10:14:02 -04:00
727362af0a
Add server_id to monitorData
2023-05-11 10:13:32 -04:00
8ae4783a33
If monitor is assigned to a server, use that server for janus url.
2023-05-11 10:13:20 -04:00
2a2c192562
Add urlToJanus function to Server class
2023-05-11 10:13:04 -04:00
b53d875dfb
remove hello
2023-05-10 11:56:12 -04:00
4c39f060ab
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-10 11:03:47 -04:00
18790a01f6
Use unviewableMonitorIds fixing invalid user of u->MonitorIds
2023-05-10 11:03:39 -04:00
a8365d40b4
Fix array uses of user object. Include data-id in monitor div.
2023-05-10 11:03:10 -04:00
8c99df24fd
Set log entries to vertical-align: top. Fixes #3700
2023-05-09 12:56:10 -04:00
71b31e9ad8
Provide restricted list of HomeView in a dropdown instead of text entry
2023-05-04 15:59:00 -04:00
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
Isaac Connor
Simpler1
Simpler1
IPC
Isaac Connor
stefan
baudneo
AngeloGioacchino Del Regno
dependabot[bot]