Isaac Connor
485af42a0b
Fix more typos
2023-05-16 14:18:26 -04:00
Isaac Connor
030d6b9696
Fix undefined mid
2023-05-16 14:14:34 -04:00
Isaac Connor
3daee34d4d
Fix typo
2023-05-16 14:11:53 -04:00
Isaac Connor
c8c4b560af
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-16 14:11:21 -04:00
Isaac Connor
6eb166c938
Handle matches2 not being defined
2023-05-16 11:53:48 -04:00
Isaac Connor
ea37449023
Add auth_relay to control command
2023-05-16 11:53:34 -04:00
Isaac Connor
22bd680e40
FIx ::
2023-05-16 10:23:39 -04:00
Isaac Connor
fc90d7bc2b
Remove debug
2023-05-15 16:08:51 -04:00
Isaac Connor
9e007ea8d7
Shorten inputs on filter to make them fit
2023-05-15 12:45:10 -04:00
Isaac Connor
d189d820a8
Don't log errors from port_open, don't close the unopened fp
2023-05-15 10:47:54 -04:00
Isaac Connor
586fd5edb7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-15 10:05:13 -04:00
Isaac Connor
847e803e82
If failed to open image, send a test jpeg explaining
2023-05-15 10:05:06 -04:00
Isaac Connor
6dd9473e71
Reorder inputs, works better on mobile
2023-05-15 10:04:36 -04:00
Isaac Connor
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
Isaac Connor
6046398981
Add event Name to the event detail modal
2023-05-12 15:15:55 -04:00
Isaac Connor
df983039c4
Add an import modal for use in add_monitor view
2023-05-12 15:14:46 -04:00
Isaac Connor
3436999665
Populate EndTime when NULL. Deal with case insensitive LIKE searching
2023-05-12 15:13:48 -04:00
Isaac Connor
3009c4902d
Use User object find instead of raw sql
2023-05-12 15:11:40 -04:00
Isaac Connor
54373e4e85
It is not necessary to escape the field as cakephp will do it for us
2023-05-12 15:07:28 -04:00
Isaac Connor
494be9c0ef
Add named parameter filtering to Storage controller
2023-05-12 14:10:53 -04:00
Isaac Connor
4472269f3c
Finish roughing in UserPreference in api
2023-05-12 14:10:53 -04:00
Isaac Connor
0d561bbf73
Add StartTimeSecs and EndTimeSecs to returned data in Event
2023-05-12 14:10:53 -04:00
Isaac Connor
d0fead5b06
Add setMaxFPS and fix streamCommand so that data doesn't pollute other commands data
2023-05-12 14:10:52 -04:00
Isaac Connor
dcf551ff69
Make form 100% so that scroll bar appears
2023-05-12 13:38:03 -04:00
Isaac Connor
ef424a39b6
Improve Amcrest detection with snapshot image. Fix using auth from monitor overriding other cameras
2023-05-12 13:15:55 -04:00
Isaac Connor
6014032cc8
Fix layout on add monitors
2023-05-12 13:02:33 -04:00
Isaac Connor
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
Isaac Connor
51755b4f4e
Fix updating having Id in it
2023-05-12 12:56:36 -04:00
Isaac Connor
e1c3584462
Add support for HTTP_X_FORWARDED_FOR instead of REMOTE_ADDR. Comment out debugging
2023-05-12 12:53:26 -04:00
Isaac Connor
d0b8018d9c
Add setting of User Name
2023-05-12 12:52:51 -04:00
Isaac Connor
7dd09ea55e
When killing stream, stop and abort
2023-05-12 12:50:35 -04:00
Isaac Connor
81fd2dcb08
Don't pollute streamCmdParams
2023-05-12 12:48:31 -04:00
Isaac Connor
c4c3dddbe3
add in setMaxFPS
2023-05-12 12:46:16 -04:00
Isaac Connor
995954db3d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-12 11:35:21 -04:00
Simpler1
85fd53a21d
fix(sound): Alarm sound for zone & zones views
2023-05-12 11:22:25 -04:00
Isaac Connor
e69dc8fd12
Handle missing toggleZonesBtn
2023-05-12 09:10:36 -04:00
Isaac Connor
6e8347c693
Use viewableMonitorIds instead of deprecated MonitorIds
2023-05-12 08:59:36 -04:00
Simpler1
4610734109
feat(event): Add keyboard control
2023-05-11 14:01:30 -04:00
Isaac Connor
9fbf140fc3
fix eslint
2023-05-11 10:23:12 -04:00
Isaac Connor
a31887634a
Inlcude port in url to janus
2023-05-11 10:23:04 -04:00
Isaac Connor
241667340d
Add server_id to monitorData
2023-05-11 10:14:02 -04:00
Isaac Connor
727362af0a
Add server_id to monitorData
2023-05-11 10:13:32 -04:00
Isaac Connor
8ae4783a33
If monitor is assigned to a server, use that server for janus url.
2023-05-11 10:13:20 -04:00
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
Isaac Connor
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
Isaac Connor
d9f5d3c357
Implement StartDateTimeSecs
2023-04-22 10:48:41 -04:00
Isaac Connor
312d0ba841
Use objdetect as thumbnail if it exists.
2023-04-22 10:47:33 -04:00
Isaac Connor
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
Isaac Connor
c36be30e2a
Rough in an image proxy
2023-04-22 10:29:27 -04:00
Isaac Connor
d1543f7dd9
Fix missing )
2023-04-22 09:37:53 -04:00
Isaac Connor
4d8d4b6ee5
Update add_monitors to make it scan the network.
2023-04-21 17:52:14 -04:00
Isaac Connor
e4509a54ce
Move form control search box font fix to skin so it affects everywhere
2023-04-21 17:51:44 -04:00
Isaac Connor
0480a745d8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-21 17:37:44 -04:00
Isaac Connor
9102389394
Remove debugging from font loading
2023-04-21 17:33:14 -04:00
baudneo
343dd7006c
Fix ESLint errors
...
GitHub web editor adds tabs when it autoformats code,
2023-04-20 00:44:04 -06:00
baudneo
7a7c57f4d4
Update monitor.js
...
Fix indentation.
2023-04-20 00:39:42 -06:00
baudneo
ad6f93d6d8
Update monitor.js
...
Hide Janus RTSP Timeout when use Janus is unchecked.
2023-04-20 00:36:04 -06:00
Isaac Connor
94ef0939ba
Add Deleted=false to sql loading monitors
2023-04-19 18:57:11 -04:00
Isaac Connor
02046b9c88
Use object methods to load monitor and delete it
2023-04-19 18:56:52 -04:00
Isaac Connor
73548dda73
Add Deleted member
2023-04-19 18:56:29 -04:00
Isaac Connor
6a2d28d92f
If Monitor is deleted, don't show event
2023-04-19 18:56:19 -04:00
AngeloGioacchino Del Regno
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
("add h264_mmal as a decoder option")
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
2023-04-18 18:02:48 +02:00
Isaac Connor
2c2b0a4c30
Add current setting for analysing and recording to Function column
2023-04-13 17:08:13 -04:00
Isaac Connor
2447f6e0db
Fix wrong number of parameters when using text search
2023-04-13 13:27:20 -04:00
Isaac Connor
ad89fe94ac
If holding ctrl when clicking zoomout button, zoom out all the way
2023-04-13 12:25:50 -04:00
Isaac Connor
8a434c95fc
Fix checkbox column still being on the right in the footer
2023-04-13 12:25:26 -04:00
Isaac Connor
1f11493266
Don't need to add auth_hash if we have auth_relay
2023-04-13 10:13:27 -04:00
Isaac Connor
50be9b6bf1
Allow table to have 200 rows instead of 100.
2023-04-13 10:13:06 -04:00
Isaac Connor
036091d7e1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-11 12:12:09 -04:00
Isaac Connor
1fcb29bbba
Fix the auto population of ControlAddress with user:port@ip
2023-04-11 12:12:04 -04:00
Isaac Connor
1f87eddd48
Cast event counts to int so that they say 0 instead of null
2023-04-11 08:22:18 -04:00
Isaac Connor
08e315c25d
Fix unmatched}
2023-04-11 07:55:23 -04:00
Isaac Connor
6fd46c54d5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-11 07:54:02 -04:00
Isaac Connor
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
Isaac Connor
22bca46921
When viewing events with no startdate add a blak StartDate filter
2023-04-10 18:09:29 -04:00
Isaac Connor
74409daec4
Fix 5MP resolution
2023-04-10 14:20:53 -04:00
Isaac Connor
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
Isaac Connor
aff74f0dab
Add text spans on buttons so we could hide text if we wanted to
2023-04-10 10:49:26 -04:00
Isaac Connor
e447137bf9
Define ZM_DIR_SOUNDS on montage
2023-04-09 08:58:28 -04:00
Isaac Connor
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
Isaac Connor
75d9d9ad9b
Fix eslint
2023-04-07 12:09:01 -04:00
Isaac Connor
92f8adb654
Fix eslint
2023-04-07 12:08:18 -04:00
Isaac Connor
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
Simpler1
26d39dcde6
feat(event): Shift delete with no confirm
2023-04-07 12:00:53 -04:00
Simpler1
e0dd6ccca2
feat(event): Shift delete with no confirm
2023-04-07 11:26:32 -04:00
Isaac Connor
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
Isaac Connor
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
Simpler1
0a84cd0327
fix(alarmSound): Use Audio.play() for alarm sound
2023-04-07 10:55:09 -04:00
Simpler1
d4b9982584
feat(events): Shift delete with no confirm
2023-04-07 10:54:15 -04:00
Simpler1
4b0a6e1cb0
feat(watch): Shift delete with no confirm
2023-04-07 10:53:11 -04:00
Isaac Connor
2343a42eea
Add Resolution to event stats
2023-04-06 19:03:40 -04:00
Isaac Connor
37c1b923bb
Update var=>const, and add detection of unapplied scale to image stream, and re-apply
2023-04-06 19:03:24 -04:00
Isaac Connor
1ada7d7504
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-06 15:16:12 -04:00
Isaac Connor
01b886ef49
Add scale to status and fix cast on elapsed
2023-04-06 15:15:36 -04:00
Isaac Connor
a256056d0a
All float values in various fields
2023-04-05 17:50:56 -04:00
Isaac Connor
ce0a83f904
Reduce minimum to .05% as that is what seems to be necessary these days
2023-04-05 17:47:03 -04:00
Isaac Connor
394cd6e0f8
AlarmRGB should be an actual hex value not a string
2023-04-05 17:46:29 -04:00
Isaac Connor
23fb13f660
Show streams even if not running, since they may be on a different server
2023-04-05 17:46:08 -04:00
Isaac Connor
21f6bdae35
Change minimum percent to 50% instead of 3%
2023-04-05 14:46:13 -04:00
Isaac Connor
d170112ef7
Change minimum percent to 50% instead of 3%
2023-04-05 14:45:30 -04:00
Isaac Connor
b1df318491
Use ORM Zone Object for Zone insertion on new monitor
2023-04-05 14:43:50 -04:00
Isaac Connor
231b0ab631
Sync up default values with what gets added in actions/monitor
2023-04-05 14:42:44 -04:00
Isaac Connor
48067542f9
Limit progressbar to 100%
2023-04-05 08:59:16 -04:00
Isaac Connor
9284ae2908
Add Name,Email,Phone to User object
2023-04-03 12:45:09 -04:00
Isaac Connor
edaec97895
Move buttons to header
2023-04-02 18:17:03 -04:00
Isaac Connor
df2828ecba
Make new header div flex and align contents
2023-04-02 18:16:51 -04:00
Isaac Connor
7616898579
Add class to side navbar to so can hide entries there too
2023-04-02 17:20:37 -04:00
Isaac Connor
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
Isaac Connor
44ebd80334
Parse and substitute events numbers with a link to the event.
2023-04-02 16:38:02 -04:00
Isaac Connor
e739cc2a34
Remove debug
2023-04-02 16:28:42 -04:00
Isaac Connor
7e00621e27
Make events column headers links too
2023-04-02 16:28:23 -04:00
Isaac Connor
c23469e3eb
limit height of filter inputs because chosen multi-select can get too tall
2023-04-02 16:28:05 -04:00
Isaac Connor
aaf5f4f207
Use val() on the select instead of trickery to get the array of selected values
2023-04-02 16:27:39 -04:00
Isaac Connor
3a20ab64c7
Turn dropdowns into chosen multiple-selects
2023-04-02 16:27:14 -04:00
Isaac Connor
d5baadca84
Comment out debug
2023-04-02 16:10:24 -04:00
Isaac Connor
86768d108a
Fix values not being used in log query causing errors when level filter isused
2023-04-01 09:41:37 -04:00
Isaac Connor
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
Isaac Connor
e0c1aeb823
Use jquery text() instead of DOM innerHTML to change icon
2023-03-28 18:09:04 -04:00
Isaac Connor
db58e9f7ef
Use alt and title tags on frame images
2023-03-28 16:35:20 -04:00
Isaac Connor
06cad49b80
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-03-28 16:34:05 -04:00
Isaac Connor
ca0f04f3a7
Fix assignment to const
2023-03-28 16:31:33 -04:00
Isaac Connor
aff04e3230
Remove width spec from objdetect image when viewing fullscreen
2023-03-26 10:50:11 -04:00
Isaac Connor
8f96f7de8b
fix lack of scroll in event view
2023-03-26 10:28:18 -04:00
Isaac Connor
593c7ac902
Handle HomeView not being set, and default it so that it is set
2023-03-24 12:53:49 -04:00
Isaac Connor
16b74fc474
Add title of monitor id and name like we had in 1.36
2023-03-23 20:03:40 -04:00
Isaac Connor
dd6cc74da7
Rough in UserPreference api
2023-03-22 13:22:08 -04:00
Isaac Connor
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
Isaac Connor
6c8a2ad05a
add support for shortened user= pass= which is used in auth_relay=PLAIN
2023-03-22 08:06:02 -04:00
Isaac Connor
da87187f1d
Use explode instead of split
2023-03-22 08:06:02 -04:00
Isaac Connor
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
Isaac Connor
34e3e99c99
Rough in code for User_Preferences
2023-03-21 10:03:57 -04:00
Isaac Connor
cd167d8aec
Fix eslint
2023-03-21 10:02:53 -04:00
Isaac Connor
e60586feee
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-03-21 09:54:40 -04:00
Isaac Connor
128b3d884a
Spacing
2023-03-21 09:54:37 -04:00
Isaac Connor
e216b6b008
Add auth_relay to stream status request so that it works when AUTH_RELAY=PLAIN
2023-03-21 09:54:22 -04:00
Isaac Connor
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
Isaac Connor
7a254b42f5
Fix use of auth_relay when PLAIN
2023-03-21 09:52:50 -04:00
Isaac Connor
a45fc576c9
Improve detection of codec playability. Basically just look for h264
2023-03-21 08:21:20 -04:00
Isaac Connor
766cdcde9e
Add auth_relay to cycle urls so that auth works on cycle view
2023-03-19 11:31:44 -04:00
Isaac Connor
8bef309a86
Values in terms are comma separated, so split the val for Monitor selection
2023-03-16 08:43:01 -04:00
Isaac Connor
97879eab49
Fix missing s causing problems when Group permission set to None
2023-03-08 10:59:33 -05:00
Isaac Connor
06f750c42b
add in is_isnot_opTypes and booleanValues and use them in simple_widget
2023-03-05 13:26:08 -05:00
Isaac Connor
ed9f02d4b0
show icons even if loading times out
2023-03-05 12:54:08 -05:00
Isaac Connor
3431a82f76
Add classes to option rows so we can style them individually
2023-03-05 10:57:35 -05:00
Isaac Connor
065464a7f8
Use new getHomeView function instead of view=console
2023-03-05 10:21:59 -05:00
Isaac Connor
4c586b67ba
Fix include from api to users for users tab
2023-03-05 10:21:39 -05:00
Isaac Connor
3e86454fc6
implement getHomeView function
2023-03-05 10:21:18 -05:00
Isaac Connor
aac9c644fb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-28 14:06:16 -05:00
Isaac Connor
6000ceaf2e
Add Name, Email, Phone to user edit
2023-02-28 14:06:00 -05:00
Isaac Connor
18403bf33e
Move users list from options into an include. Add Email, Phone, Name fields
2023-02-28 13:59:16 -05:00
Isaac Connor
94efc5ff73
Add fontfaceobserver.js
2023-02-28 13:58:17 -05:00
Isaac Connor
ecf91ff6a0
Unhide material icons once the font has loaded
2023-02-28 13:58:02 -05:00
Isaac Connor
ad4bc04bfb
Hide material icoins until font is loaded.
2023-02-28 13:57:46 -05:00
Isaac Connor
d75364ff53
Need to always include auth.php, as it has functions like canView
2023-02-27 17:02:23 -05:00
Isaac Connor
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
Isaac Connor
82491b3d81
Addd server_stats route
2023-02-27 10:59:14 -05:00
Isaac Connor
1e75ab7541
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-26 17:04:09 -05:00
Isaac Connor
8a6f0cbe1b
Add ServerStats to api
2023-02-26 17:04:05 -05:00
Isaac Connor
5027bf207e
add h264_mmal as a decoder option
2023-02-26 16:30:31 -05:00
Isaac Connor
72652cfb64
Add Decoder options to monitor view
2023-02-26 16:04:32 -05:00
Isaac Connor
af6e38caf0
Merge branch 'master' into patch-2
2023-02-26 10:14:35 -05:00
Isaac Connor
6505bba826
Add qsv codec options
2023-02-25 19:00:31 -05:00
Isaac Connor
1cdd1325bf
Fix eslint
2023-02-25 16:26:19 -05:00
Isaac Connor
79d19c21d1
Update validating access to Monitors, using canView due to Monitor and Groups permissions
2023-02-25 16:13:39 -05:00
Isaac Connor
9ceb22db8f
Fix auth for monitor_permissions...
2023-02-25 16:00:34 -05:00
Isaac Connor
9fe1e507c7
fix scroll bars on user edit when sticky headers
2023-02-25 15:54:42 -05:00
Isaac Connor
84383a0498
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-25 13:17:53 -05:00
iconnor@connortechnology.com
3cda5ab235
Include map.js
2023-02-25 13:06:17 -05:00
iconnor@connortechnology.com
afcf55608e
Move map generation into an Object so it can be reused.
2023-02-25 13:04:49 -05:00
iconnor@connortechnology.com
155502ee32
Must include Storage.php
2023-02-25 13:02:29 -05:00
iconnor@connortechnology.com
a7743dd0ed
Add DiskTotalSpace and DiskUsedSpace to returned Storage objects
2023-02-25 13:02:19 -05:00
Isaac Connor
a7af29c0c4
Add IN operator
2023-02-25 13:00:38 -05:00
Isaac Connor
0995a44561
Only show Location tab if geolocation is turned on
2023-02-25 12:46:48 -05:00
Isaac Connor
a2879fb66c
Add Map view to header
2023-02-25 12:46:34 -05:00
Isaac Connor
b0413f330e
Merge branch 'map'
2023-02-25 12:44:28 -05:00
iconnor@connortechnology.com
4979d299a6
Cleanup code style
2023-02-25 12:40:54 -05:00
iconnor@connortechnology.com
cbabf9d5ce
Add getFromApi
2023-02-25 12:40:41 -05:00
Isaac Connor
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
Isaac Connor
82a28b78d8
Use function style of member access to prevent errors on unsaved monitor
2023-02-23 13:22:50 -05:00
Isaac Connor
6867b0c841
Correct the syntax of the CSP
2023-02-23 09:47:49 -05:00
Isaac Connor
32afb13b39
Sanitise attr input in FilterTerm to prefent SQL Injection. Fixes GHSA-222j-wh8m-xjrx
2023-02-23 09:25:03 -05:00
Isaac Connor
7b36027066
add in files actions, with delete
2023-02-22 05:59:16 -05:00
Isaac Connor
4a19b4ec05
Scale the thumbnail, not the full view
2023-02-21 14:26:37 -05:00
Isaac Connor
d6dc1d3e30
Add object-src CSP directive
2023-02-20 18:15:16 -05:00
Isaac Connor
44c7582003
Don't shorten analysis
2023-02-20 17:30:48 -05:00
Isaac Connor
d073ba37ba
Default to Monitor->DefaultScale instead of 100% scale.
2023-02-20 15:42:30 -05:00
Isaac Connor
bfbe0d581b
uncomment out the mintime and maxtime validations. They were commented out for some quick testing.
2023-02-20 12:27:16 -05:00
Isaac Connor
119e4e6756
use detaintPath on modal to prevent including other files instead of real modals
2023-02-20 11:58:10 -05:00
Isaac Connor
4067151fd8
Check for valid date in minTime and maxTime to prevent SQL attack
2023-02-20 11:54:50 -05:00
Isaac Connor
8d36edb602
Be more specific about which form we are styling so as not to affect modals
2023-02-20 11:54:29 -05:00
Isaac Connor
4f66ab3503
Introduce check_datetime function to validate dates
2023-02-20 11:53:53 -05:00
Isaac Connor
00234fbb20
Attempt to sanitize daemon and arguments before executing commands to prevent executing other programs.
2023-02-20 11:53:32 -05:00
Isaac Connor
82a9d6d444
Use validCardinal on Id to prevent executing other commands
2023-02-20 11:41:41 -05:00
Isaac Connor
d6575cdec3
Adjust size of text inputs MonitorName and Source Path Filters to match chosen inputs
2023-02-20 10:36:13 -05:00
Isaac Connor
f4a2925177
Test for valid monitor id in snapshot creation.
2023-02-20 10:30:34 -05:00
Isaac Connor
bf810ec8c4
test for existence of username in session to prevent error outputs
2023-02-20 10:20:59 -05:00
Isaac Connor
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
Isaac Connor
3268f95282
Fix detaintPath not stripping sequences like ..././
2023-02-20 09:18:51 -05:00
Isaac Connor
2ec375d51c
Default to auto instead of 100% scale.
2023-02-19 17:29:32 -05:00
Isaac Connor
74a0790c56
Use const instead of var, code comment fix
2023-02-19 17:29:32 -05:00
Isaac Connor
3803a872fc
Replace some vars with const or let
2023-02-19 17:29:32 -05:00