Commit Graph

7824 Commits

Author SHA1 Message Date
Isaac Connor
df26c25ac9 Add continuous mouseup/down functionailty for Zoom,White,Iris,Focus 2021-04-17 16:32:06 -04:00
Isaac Connor
d598edc7df Implement duplicate RTSPSTreamName check 2021-04-17 12:50:26 -04:00
root
23f1b68e8a Merge branch 'continuous' into cont_mast 2021-04-16 11:28:10 -04:00
root
f3ea08c4a1 Merge branch 'continuous' into cont_mast 2021-04-16 11:27:48 -04:00
Isaac Connor
3d1b0e2724 Apply onmouseup/down to other ptz buttons 2021-04-16 11:27:08 -04:00
Isaac Connor
c880618d5f If no button is associated with the event, assume it is a mouseup 2021-04-16 10:24:48 -04:00
Isaac Connor
e0c0598e13 Add on-mouseup and on-mousedown processing 2021-04-16 10:15:57 -04:00
Isaac Connor
d7fa28142f Use on-mousedown and on-mouseup if doing continuous 2021-04-16 10:15:07 -04:00
Isaac Connor
113e495a7d Fix margin in ptz buttons 2021-04-14 14:00:24 -04:00
Isaac Connor
24cfc8583f Include auth relay in getNavBar request. COOKIES will expire so we need this. 2021-04-14 13:00:16 -04:00
Isaac Connor
95249d5eb4 Merge branch 'release-1.34' 2021-04-12 16:32:57 -04:00
Isaac Connor
3921231cd5 Use some styles for user view to split it into two columns 2021-04-12 16:00:11 -04:00
Isaac Connor
3335976cba implement remote api Trigger support. 2021-04-12 15:59:31 -04:00
Isaac Connor
007dce45fb Add disable alarms as an alarm command 2021-04-12 15:59:31 -04:00
Isaac Connor
29e91f48e6 Use Snapshots permission instead of Events for snapshots 2021-04-12 15:59:31 -04:00
Isaac Connor
b125b5d370 Allow users with snapshot::view to view the snapshot image of an event 2021-04-12 15:59:31 -04:00
Isaac Connor
04cc8ed34f Split user info into two columns 2021-04-12 15:59:31 -04:00
Isaac Connor
f3773a89ad Add Snpahot permission 2021-04-12 15:59:31 -04:00
Isaac Connor
f59a72a638 Use Snapshots permission instead of Events permission for Snapshots 2021-04-12 15:59:31 -04:00
Isaac Connor
1b50314f9e Add DisableAlarms function 2021-04-12 15:59:31 -04:00
Isaac Connor
7e579fd851 Implement Snapshots user permission 2021-04-12 15:59:31 -04:00
Isaac Connor
a07374e206 Fix password getting unset in global user object. Add Snapshots to user permissions 2021-04-12 15:59:31 -04:00
Isaac Connor
7aa625ea8e Don't both loading all the Object code until after auth. 2021-04-12 15:59:31 -04:00
Isaac Connor
a3078d61f7 Default monitor filter bar to showing. Remove container-fluid which was adding padding at right and left. It should go elsewhere if needed. 2021-04-12 15:59:31 -04:00
Isaac Connor
ed29021179 Rough in an importance setting in monitor that we can use to decrease the log level of certain events like PrimeCapture for cameras that we don't care about 2021-04-11 12:59:18 -04:00
Isaac Connor
64ab6dff95 fix missing ) 2021-04-10 18:16:59 -04:00
Isaac Connor
cf721ae875 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2021-04-10 18:16:17 -04:00
Isaac Connor
1ccc416224 Merge branch 'release-1.34' 2021-04-09 20:00:47 -04:00
Isaac Connor
1ccb8d7aef Include Event Summaries when loading Monitors 2021-04-09 19:46:57 -04:00
Isaac Connor
3dcb71933e Add event summary fields to Monitor Object 2021-04-09 19:46:25 -04:00
Isaac Connor
2b1e0df6be FIx auth= not getting updated 2021-04-09 18:46:41 -04:00
Isaac Connor
492a352bed Use updated auth_hash when sending alarm requests 2021-04-09 18:33:32 -04:00
Isaac Connor
2e22cd5c3b Mark snapshot events as Archived 2021-04-08 15:20:44 -04:00
Isaac Connor
99c28d1f9f Change log level to debug when warning about ZM_OPT_AUTH being turned off. Fixes #3207 2021-04-07 09:47:48 -04:00
Isaac Connor
2d64c616ba Add help for BadEncoderParameters 2021-04-01 11:53:57 -04:00
Isaac Connor
73082a2d33 Remove the H264/X264 from the dropdown labels. Could be H265 or other 2021-04-01 11:53:57 -04:00
Isaac Connor
ba9acd3037 Add test for no encoder settings 2021-04-01 11:53:57 -04:00
Isaac Connor
7e3d6f867e Set the default crf so that encoding works 2021-04-01 11:53:57 -04:00
Isaac Connor
80e5076d2a cache bust jquery and bootstrap 2021-03-31 18:27:43 -04:00
Isaac Connor
9af97c50aa Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2021-03-31 12:40:35 -04:00
Isaac Connor
c3ce9913cf Upgrade cakephp to 2.10.24 2021-03-31 12:11:12 -04:00
Isaac Connor
790cdf879a Add D1-PAL resolution 2021-03-31 11:05:17 -04:00
Isaac Connor
6c4e423a8b Spacing 2021-03-30 18:20:31 -04:00
Isaac Connor
3d01008510 use json_encode($User) instead of specific elements. For some reason $user['Id'] isn't defined for me atm. 2021-03-30 18:20:23 -04:00
Isaac Connor
cbd8b22efb Fix setting value when not empty 2021-03-30 14:28:17 -04:00
Isaac Connor
78c5531357 Increase width of LabelFormat to fit our default. Incrase various number inputs to fit up/down arrows 2021-03-30 13:32:02 -04:00
Isaac Connor
8582c1a652 Once again fix saving string value to '' so that we can empty LabelFormat 2021-03-30 13:31:26 -04:00
Isaac Connor
beb7a75d5a Implement canView for Monitors 2021-03-30 11:52:04 -04:00
Isaac Connor
aeb98ec790 Implement canView for Groups. Implement Monitors() and Children() functions. Use canView when populating Group dropdown 2021-03-30 11:51:52 -04:00
Isaac Connor
e9641938f0 Fix eslint 2021-03-27 18:25:04 -04:00