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
Isaac Connor
Isaac Connor
Simpler1
Simpler1