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
097c2bca83
fix lack of scrolling on events.
2023-01-16 19:18:20 -05:00
8fa1d98a7b
Merge branch 'master' of ../ZoneMinder.connortechnology
2023-01-16 17:23:52 -05:00
f942303e12
Set minimum width on sidebar to get rid of horizontal scroll
2023-01-16 17:17:38 -05:00
e6b897014c
Make controls scrollable when sticky navbar
2023-01-16 16:38:35 -05:00
06be7a6633
Pput buttons at top in options
2023-01-16 16:38:35 -05:00
76e3756ea6
Fixup structure and add styles for sticky header
2023-01-16 16:38:35 -05:00
378a9dc94f
Rework snapshots for stick headers
2023-01-16 16:38:35 -05:00
22b735b57c
Add overflow style for stick headers
2023-01-16 16:38:35 -05:00
dc40fe3049
Add content div and replace invisible flip code with the code we use in montage
2023-01-16 16:38:35 -05:00
75430dad9e
Remove flip code as we are using the code in skin.js now. Instead of setting height to auto, just clear it so that css rules apply.
2023-01-16 16:38:35 -05:00
b517af6d29
add styles to handle stick headers on montage
2023-01-16 16:38:35 -05:00
3b0843d8d0
Specify form on filter view is 100% so that scroll bars happen
2023-01-16 16:38:35 -05:00
992984b0cd
Add #content and #monitor divs so we can do stick navbar on monitor view
2023-01-16 16:38:35 -05:00
450007b860
Use getBodyTopHTML(); in watch view so that we pick up the sticky class
2023-01-16 16:38:35 -05:00
9089501bd8
Remove flexbox from #content because it is now on #page
2023-01-16 16:38:35 -05:00
5a990cb9cb
Add #page div for consistency also we are going to use it instead of #content for flexbox
2023-01-16 16:38:35 -05:00
3e1c816914
Merge divs and remove h-100 on sidebar ul that causes content to wrap sideways
2023-01-16 16:38:35 -05:00
26dfee496e
Use getBodyTopHTML(); in groups view so that we pick up the sticky class
2023-01-16 16:38:35 -05:00
2c6c7467f9
Add overflow styles to columns in options
2023-01-16 16:38:35 -05:00
9c15f794bf
Add overflow style to filter form so that it scrolls when using sticky headers
2023-01-16 16:38:35 -05:00
cb6d819c1e
Make #page flex as well when sticky.
2023-01-16 16:38:35 -05:00
b070749061
Split content div containing buttons from monitorlist so that we can position them separately
2023-01-16 16:38:35 -05:00
aa911f8968
Update logs view to make sticky headers work
2023-01-16 16:38:35 -05:00
ecf5089051
add flex styles to form and overflow to monitor list. These don't really have any effect normally so I havn't added a .sticky selector to them.
2023-01-16 16:38:35 -05:00
4f6a26dea9
Add styles so that when body has a .sticky class, we use flexbox to make content fill the browser, and we can then make sub content scrollable so that navbars are sticky
2023-01-16 16:38:35 -05:00
5dc658dd55
add sticky class to body when ZM_WEB_NAVBAR_STICKY is set. Remove it from navbar.
2023-01-16 16:38:35 -05:00
b82b8d2b67
Remove debug, add willReadFrequently: true to canvas ctx.
2023-01-16 16:38:35 -05:00
0af2a3eb10
Make header navbar sticky, make entire second navbar go away when minmised.
2023-01-16 16:38:35 -05:00
17e9a64f91
Remove frames loading code. We do it via api now.
2023-01-16 16:38:35 -05:00
ab2769ea48
Bulk load frames instead of by individual event
2023-01-16 16:38:35 -05:00
d059806573
fix UrlToApi => urlToApi
2023-01-13 13:50:05 -05:00
b9a1e1cb6c
use ajax() instead of getJSON so we can specify no timeout
2023-01-13 13:43:39 -05:00
cb87d04b3e
Move api page content from options.php to _options_api.php
2023-01-13 13:42:23 -05:00
292f3a0cc2
Remove reference to zm.connortechnology.com
2023-01-13 12:48:26 -05:00
1236b366a1
Need to index into servers array using 0 not ''
2023-01-13 12:48:02 -05:00
b1486783e3
Add a 5 second cycle option
2023-01-13 12:34:51 -05:00
cf0bc32fd4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-12 10:19:11 -05:00
a8c80fde27
Update monitor preset view: Use a submit button instead of input with javascript. Remove no longer needed js code. Sort presets by Name.
2023-01-12 10:01:40 -05:00
2e6f465055
eslint doesn't like function names that start with a capital
2023-01-12 09:38:13 -05:00
427201abd5
Fix eslint
2023-01-12 09:37:53 -05:00
4dbc198fd0
Only load events when not in live mode
2023-01-12 09:03:48 -05:00
8c3cd92801
Merge branch 'master' of ../ZoneMinder.connortechnology
2023-01-10 12:11:01 -05:00
1426e89aff
Remove debugging
2023-01-10 12:10:45 -05:00
1ee526444b
populate monitor_names array to we can output the dropdown
2023-01-10 12:07:35 -05:00
0befc7796a
Add code to populate dropdown input for attr type Monitor.
2023-01-10 12:07:35 -05:00
6e014949b4
Don't require zmc to be running to show a thumbnail. zms will say unable to connect, but at least later we can mouse over and get an updated image.
2023-01-10 12:07:35 -05:00
cc611129b6
Add RTSPServer help, Add Janus RTSP session timeout help.
...
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
2023-01-09 17:57:27 -07:00
aab62c5a7e
Add Janus RTSP session timeout to PHP (front end) ⚗️
...
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
2023-01-09 17:57:26 -07:00
eca1f5d2fd
Typo ✏️
...
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
2023-01-09 17:57:26 -07:00
09b621bb5e
Load Frames dynamically instead of in the initial page load. Use the api to do so.
2023-01-09 16:59:03 -05:00
662aa9f39d
Add getting frames by event id or other named filters to api
2023-01-09 16:53:27 -05:00
c9147be445
Add debug logging when date.getTime isn't a valid function I assume because EndDateTime was null
2023-01-09 14:45:31 -05:00
f06e11a097
Add SectionLengthWarn, use it to disable warnings in logs about section length being exceeded.
2023-01-07 12:33:42 -05:00
18b8080569
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-04 13:10:15 -05:00
ddf0996bd9
Fix eslint
2023-01-04 13:10:04 -05:00
3f527eb0d4
Test for existence of Janus elements
2023-01-04 11:48:16 -05:00
f1ea101bc3
Fix fatal when invalid mintime/maxtime is specified
2023-01-04 11:44:07 -05:00
25b4ee8d08
Add missing document when adding fullscreenchange listener
2023-01-04 11:43:38 -05:00
99d9d70a39
Update code, remove console.log debugging
2023-01-03 19:19:13 -05:00
569c4337eb
Hide timestamp caption from bottom of video.js event view. It serves no purpose. Fixes #3488
2023-01-03 19:19:13 -05:00
da934a6114
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-03 18:09:02 -05:00
9842c083f1
Fix click on control bar of video.js controls does zoom. Fixes #3650
2023-01-03 16:24:14 -05:00
0c316662e0
Remove php4 support
2023-01-03 15:50:18 -05:00
cda2191f3e
Spacing, quotes, remove dead code
2023-01-03 13:57:14 -05:00
51faa4f8dd
Use ajax() instead of getJSON with no timeout when deleting events.
2023-01-03 13:36:43 -05:00
5c9201cad3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-03 13:35:44 -05:00
2f3596d1ef
Use global Servers array instead of servers
2023-01-03 13:17:36 -05:00
d27769c0f9
Use global Servers array instead of loading from db
2023-01-03 13:17:22 -05:00
3c012bf4ba
Use global Servers array instead of loading from db
2023-01-03 13:17:13 -05:00
359c0c1b27
Don't know why we are turning off display errors in Server.php. Let's not.
2023-01-03 13:17:00 -05:00
e59687f437
Remove debug
2023-01-03 13:16:38 -05:00
f466e5b833
Use global Servers array instead of loading from db
2023-01-03 13:16:30 -05:00
8c35190b0a
Move loading of global Servers array into config.php.
2023-01-03 13:16:03 -05:00
df8bc464e3
Fix missing checkbox column on events table. See https://github.com/wenzhixin/bootstrap-table/issues/6522
2023-01-03 11:15:58 -05:00
5f01e275c9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-02 15:25:21 -05:00
046925797a
URL encode passwords embedded in Path. from Albert John FitzPatrick, III
2023-01-02 15:25:12 -05:00
4a1722df4f
Split line so that we get a space between the limit input and the text after it.
2023-01-02 15:20:45 -05:00
27980a8871
Make event button toolbar wrap-able
...
For small screens (i.e. phones), it's
useful to split the event button toolbar
on multiple rows, otherwise the video event
becomes useless (i.e. too small to be useful)
Signed-off-by: Alex Porosanu <dknight110@gmail.com>
2022-12-31 11:58:23 +02:00
6667c6449a
Improve title of Add Monitors view
2022-12-27 14:34:41 -05:00
63f1dbf8fd
Put the filter control commands into the POST data instead of get url. Also fixes auth relay
2022-12-27 14:34:20 -05:00
f6b64a9bf1
Merge branch 'master' into map
2022-12-21 14:56:25 -05:00
1c538a4bf0
Include Capturing, Analysing, Recording instead of Function
2022-12-14 08:28:21 -05:00
e4b4fae584
Merge branch 'master' of ../imouse
2022-12-13 16:44:21 -05:00
fd3640aca3
Fix op always being =
2022-12-13 16:44:02 -05:00
52dfca5a28
Hide WIP button
2022-12-13 12:42:24 -05:00
327f8c0f70
add missing semi colon
2022-12-12 13:12:40 -05:00
0a28a3e659
Add check for REQUEST['entity']. Add missing quotes around state word because it gets executed as code
2022-12-12 13:06:13 -05:00
1469178809
Work harder to select a monitor name that doesn't already exist
2022-12-12 13:05:25 -05:00
8c4a4cfe41
Don't output array entries for empty RTSPStreamName. Remove sorted_monitor_ids which is unused
2022-12-12 13:03:03 -05:00
24b8a9118d
Merge branch 'master' of ../cloudmule
2022-12-12 13:01:38 -05:00
656bc60944
Add groups to options
2022-12-12 13:00:54 -05:00
Isaac Connor
Isaac Connor
dependabot[bot]
Andrew Bauer
baudneo
Alex Porosanu