Isaac Connor
|
09e5c47f3e
|
Hide COntainer and OutputCodec options. I don't want people playing with them righ tnow.
|
2021-05-05 14:03:38 -04:00 |
|
Isaac Connor
|
2dfe66663d
|
Remove mjpeg and mpeg options. They don't make sense. Add classes so we can hide Encoder and OutputContainer options
|
2021-05-05 14:03:02 -04:00 |
|
Isaac Connor
|
6d07c7ce9f
|
specify the invalid characters
|
2021-05-04 15:56:47 -04:00 |
|
Isaac Connor
|
0b6e414998
|
Enable/Disable Snapshots based on ZM_FEATURES_SNAPSHOTS config setting
|
2021-05-04 13:19:40 -04:00 |
|
Isaac Connor
|
24d9bfa257
|
Add a test for invalid characters in Path for Ffmpeg monitors
|
2021-05-04 10:45:27 -04:00 |
|
Isaac Connor
|
b10b2932ee
|
Code spacing and doc
|
2021-05-03 15:20:11 -04:00 |
|
Isaac Connor
|
d92c95a420
|
if analysis frame doesn't exist revert back to capt
|
2021-05-03 15:18:35 -04:00 |
|
Isaac Connor
|
44e8107cac
|
Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead
|
2021-05-02 13:38:06 -04:00 |
|
Isaac Connor
|
b70cd053d6
|
spacing and quotes
|
2021-05-02 12:43:17 -04:00 |
|
Isaac Connor
|
b84efac0e5
|
left align Server head
|
2021-04-28 19:00:15 -04:00 |
|
Isaac Connor
|
f754b82f3b
|
When we do not have permission to edit monitors, return empty string instead of nothing so that we don't generate an error
|
2021-04-28 12:03:44 -04:00 |
|
Isaac Connor
|
953882a6da
|
Dirty hack to fix up/down arrows on pagination number input
|
2021-04-27 16:31:25 -04:00 |
|
Isaac Connor
|
0213c67236
|
add MinSectionLength
|
2021-04-27 15:25:09 -04:00 |
|
Isaac Connor
|
7901950c48
|
spacing
|
2021-04-26 09:40:08 -04:00 |
|
Isaac Connor
|
4385076e66
|
Fix encrypting password when saving User
|
2021-04-26 09:40:08 -04:00 |
|
Isaac Connor
|
02a1ecee6f
|
Remove dbeug
|
2021-04-26 09:40:08 -04:00 |
Peter Keresztes Schmidt
|
1dbfa0790a
|
web: fix eslint errors
|
2021-04-24 01:42:13 +02:00 |
|
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 |
|
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 |
|
Isaac Connor
|
96e641b381
|
handle if error message doesn't exist
|
2021-03-27 13:42:00 -04:00 |
|
Isaac Connor
|
4ee3380e3a
|
If auth is not turned on, redirect to console
|
2021-03-27 13:41:49 -04:00 |
|
Isaac Connor
|
4e9a5cff8e
|
Style MaxImageBufferCount
|
2021-03-26 17:02:38 -04:00 |
|
Isaac Connor
|
8e1b2ccbc7
|
Add MaxImageBufferCount
|
2021-03-26 17:02:17 -04:00 |
|
Isaac Connor
|
617264432e
|
Add help for ImageBUfferCount and MaxImageBUfferCount
|
2021-03-26 17:02:03 -04:00 |
|
Isaac Connor
|
2e675a338b
|
remove estimated ram use stuff as it is no longer possible
|
2021-03-26 14:31:18 -04:00 |
|
Isaac Connor
|
badb1c6131
|
Add MaxImageBufferCount, remove estimated ram us
|
2021-03-26 14:31:04 -04:00 |
|
Isaac Connor
|
c78e6a7cc7
|
Fix scroll bars on options view
|
2021-03-26 08:16:15 -04:00 |
|
Isaac Connor
|
4fab9fe458
|
fix error due to missing columns
|
2021-03-25 17:29:35 -04:00 |
|
Isaac Connor
|
1c8a850acf
|
Handle stream having something other than an img as it's display
|
2021-03-23 13:53:45 -04:00 |
|
Isaac Connor
|
37a8f007c8
|
remove unised function
|
2021-03-23 13:53:25 -04:00 |
|
Isaac Connor
|
7743445323
|
Handle when there isn't a server Id
|
2021-03-22 21:30:56 -04:00 |
|
Isaac Connor
|
16b33536ed
|
Turn off second Log in header
|
2021-03-22 17:49:59 -04:00 |
|
Isaac Connor
|
f306febb5f
|
use find_one when loading Server which can use caching
|
2021-03-22 17:49:59 -04:00 |
|
Isaac Connor
|
1dc32a0eed
|
Use getBodyTopHTML so that we get error reporting
|
2021-03-22 13:00:08 -04:00 |
|
Isaac Connor
|
be0841832e
|
enable reporting saving errors back to web ui.
|
2021-03-22 12:59:41 -04:00 |