Isaac Connor
|
9254c99ab8
|
Add ModectDuringPTZ
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
f4837d72ee
|
add text for ModectDuringPTZ
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
f59904ea7e
|
Add ModectDuringPTS checkbox on Control tab
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
4d9fb5b225
|
Don't show live thumbnail if we do not have Stream permission. Do not show groups if not view permission. Do not make them links to montage if no stream permission
|
2021-04-23 09:51:38 -04:00 |
|
Isaac Connor
|
37e0f010e3
|
Require session to be instantiated
|
2021-04-23 09:08:48 -04:00 |
|
Isaac Connor
|
15a769bcd1
|
add hashing of passwords on user save
|
2021-04-23 09:07:50 -04:00 |
|
Isaac Connor
|
e01533af7f
|
Add users to routes
|
2021-04-23 08:52:55 -04:00 |
|
Isaac Connor
|
d07d85dd6c
|
Clean User add to match behaviour of Monitors. For some reason posting to index doesn't call add unlike Monitors. Clean out duplicated Views
|
2021-04-22 12:25:13 -04:00 |
|
Isaac Connor
|
354a3d9f09
|
Add on-mouseup and on-mousedown processing
|
2021-04-21 12:20:06 -04:00 |
|
Isaac Connor
|
79cede7cac
|
Merge branch 'release-1.34'
|
2021-04-20 09:24:49 -04:00 |
|
Isaac Connor
|
c0eb790e45
|
Fix colour shift in Crop function due to not multiplying x position by colours
|
2021-04-19 17:29:31 -04:00 |
|
Isaac Connor
|
70313ce152
|
Revert "Add on-mouseup and on-mousedown processing"
This reverts commit e0c0598e13.
|
2021-04-19 17:15:35 -04:00 |
|
Isaac Connor
|
ffb2d937e1
|
Revert "Use on-mousedown and on-mouseup if doing continuous"
This reverts commit d7fa28142f.
|
2021-04-19 17:15:20 -04:00 |
|
Isaac Connor
|
aaa1309377
|
Use > instead of >= to fix duplicated log entries display
|
2021-04-19 17:14:51 -04:00 |
|
Isaac Connor
|
80835614d5
|
Define timeout
|
2021-04-19 15:49:06 -04:00 |
|
Isaac Connor
|
1a5d87b3b8
|
Add GetCurrentLocation
|
2021-04-19 15:45:55 -04:00 |
|
Isaac Connor
|
506e5f84c9
|
Remove getCurrentLocation label that says Longitude
|
2021-04-19 15:45:18 -04:00 |
|
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 |