Isaac Connor
|
1abbc187e9
|
Merge pull request #3242 from connortechnology/fix_3232_api_monitor_event_summaries
Add Event_Summary model so that it is included in monitor listing
|
2021-05-19 20:32:50 -04:00 |
Isaac Connor
|
a4df8df5e5
|
Fix status of delete button when archived. Change title to say that you can't delete due to archived
|
2021-05-19 20:32:26 -04:00 |
|
Isaac Connor
|
f6a271c90d
|
Merge pull request #3240 from connortechnology/fix_3237
fix warnings not being displayed
|
2021-05-19 20:32:11 -04:00 |
|
Isaac Connor
|
e246083be5
|
Add StartDateTime Attr in sort dropdown
|
2021-05-12 10:32:03 -04:00 |
|
Isaac Connor
|
363b017977
|
If error was unauthorized, do a reload.
|
2021-05-12 10:32:03 -04:00 |
|
Isaac Connor
|
f3b4ccf758
|
Fix scaling when scale to fit
|
2021-05-10 11:08:16 -04:00 |
|
Isaac Connor
|
b1ac0e61a9
|
put back upstream version 3.2.0 of Crud
|
2021-05-09 18:18:03 -04:00 |
|
Isaac Connor
|
2cf6ad8089
|
Switch ZMPacket * to a shared_ptr<ZMPacket>. This is so that in LockedPacket we can unlock and then notify and be confident that packet_ won't have been deleted. Change ZMPacket->timestamp to be a timeval instead of timeval *. This might not have been necessary but I like it. No longer cuse the ZMPacket object to wrap the shared image buffers and timestamps. Use a vector for image_buffers.
|
2021-05-08 21:14:20 -04:00 |
|
Isaac Connor
|
bc11e6a95b
|
Include pre event count in min estimated ram use
|
2021-05-08 15:47:29 -04:00 |
|
Isaac Connor
|
da8128aba1
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-05-07 19:16:35 -04:00 |
|
Isaac Connor
|
ff0d6e8e0f
|
remove duplicated getModal and pass fid=fid to getModal
|
2021-05-07 15:34:08 -04:00 |
|
Isaac Connor
|
ea3bffb402
|
make getModal take additional query parameters
|
2021-05-07 15:33:49 -04:00 |
|
Isaac Connor
|
9e6367c7c3
|
look for 264 instead of x264
|
2021-05-06 17:33:04 -04:00 |
|
Isaac Connor
|
373fae2511
|
BadEncoder Params and PathNotEncoded are warnings, not errors
|
2021-05-06 11:05:05 -04:00 |
|
Isaac Connor
|
b8f0d90000
|
Put back Estimated Ram Use. Rework it to provide min/max
|
2021-05-06 10:17:46 -04:00 |
|
Isaac Connor
|
0adc2d96d6
|
Revert "remove estimated ram use stuff as it is no longer possible"
This reverts commit 2e675a338b.
|
2021-05-06 09:54:06 -04:00 |
|
Isaac Connor
|
f4bbacb3f4
|
add VideoWriter and Codec filters so that you can't select an h265 encoder for h264 etc
|
2021-05-05 16:48:49 -04:00 |
|
Isaac Connor
|
ed97ff495b
|
Unhide Codec, hide OutputContainer
|
2021-05-05 16:48:01 -04:00 |
|
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 |
|
Isaac Connor
|
3fdd2bff7f
|
Have to use === because apparently null == NOW() according to php.
|
2021-03-22 12:59:18 -04:00 |
|
Isaac Connor
|
c7b22dae81
|
get rid of nextId entirely. Don't want to use it anywhere other than setting the name
|
2021-03-22 12:07:23 -04:00 |
|
Isaac Connor
|
613ed1faf2
|
Update estimated ram use when we use the dropdown to change resolution
|
2021-03-22 12:06:48 -04:00 |
|
Isaac Connor
|
fa08240a4d
|
Fix set() and __call to use the default value when set value is ''. Fixes issues in monitor view when changing type
|
2021-03-22 12:06:25 -04:00 |
|
Isaac Connor
|
c347261e19
|
Change default of ImageBufferCount to 3
|
2021-03-22 12:05:36 -04:00 |
|
Isaac Connor
|
be653980f3
|
fix eslint
|
2021-03-21 18:17:13 -04:00 |
|
Isaac Connor
|
858ae8b11f
|
fix alignment and min width of datetime column in logs view
|
2021-03-21 18:17:13 -04:00 |
|
Peter Keresztes Schmidt
|
7f9c9c6624
|
web: make eslint happy
|
2021-03-21 21:40:41 +01:00 |
|
Isaac Connor
|
8a1284e2fa
|
Can't use a decimal step. Has to be any because browsers suck.
|
2021-03-21 12:30:56 -04:00 |
|
Isaac Connor
|
a57473a146
|
remove debug
|
2021-03-21 09:19:31 -04:00 |
|
Isaac Connor
|
284837d536
|
quotes, spaces. Also move setting redirect to to where we actually do the redirect so that actions can remove the redirect if there was an error to report.
|
2021-03-21 09:19:21 -04:00 |
|
Isaac Connor
|
cc455e5d74
|
fix require=>require_once for User.php. Use getBodyTopHTML so that we get the error reporting
|
2021-03-21 09:18:47 -04:00 |
|
Isaac Connor
|
d0adaeaabe
|
rework user saving action to use User object. Implement a duplicate username check. Deprecate php < 5.3 due to lack of bcrypt password hashing functions. Hence deprecate the use of mysql PASSWORD()
|
2021-03-21 09:18:12 -04:00 |
|
Isaac Connor
|
68f9c7c9e6
|
introduce a _last_error member to the object for reporting errors saving.
|
2021-03-20 19:27:53 -04:00 |
|
Isaac Connor
|
70e61740d3
|
Fix eslint
|
2021-03-18 16:48:26 -04:00 |
|
Isaac Connor
|
e39c293a77
|
fix eslint
|
2021-03-18 16:48:26 -04:00 |
|
Isaac Connor
|
4cb38a119e
|
Fix saving Filters and other objects. Apparently comparing 0 to NOW() doesn't work.
|
2021-03-18 14:09:15 -04:00 |
|
Isaac Connor
|
1b876f24f9
|
Must have Id as well in order to know which monitor to control
|
2021-03-17 17:15:04 -04:00 |
|
Isaac Connor
|
28700fd56b
|
Implement saving DecodingEnabled from function view
|
2021-03-16 12:09:14 -04:00 |
|
Isaac Connor
|
feec631ca5
|
Only save updated DiskSpace if event is finished
|
2021-03-15 15:02:43 -04:00 |
|
Isaac Connor
|
2a6621959c
|
We CANNOT specify nextId for the next mid to use. If we do that then we can overwrite existing db entries
|
2021-03-13 12:47:05 -05:00 |
|
Isaac Connor
|
478d11e6f2
|
Update the auth in streamCmdParams on every request. It wasn't picking up updates
|
2021-03-13 12:12:20 -05:00 |
|
Isaac Connor
|
0bb4afa0bc
|
The test for xmlhttprequest is bogus. chrome jquery JSON requests don't send it. Replace with a test for instead. So now only redirect on proper html views.
|
2021-03-13 12:11:55 -05:00 |
|
Isaac Connor
|
5eae1c0a9f
|
spacing, add code comment
|
2021-03-13 12:10:55 -05:00 |
|
Isaac Connor
|
587cebecbb
|
navbar requests don't pass an auth token so we never send an auth update. Just always send it.
|
2021-03-13 12:10:35 -05:00 |
|
Isaac Connor
|
9d33688f89
|
Honour various permissions on what's in the navbar.
|
2021-03-12 11:40:46 -05:00 |
|
Isaac Connor
|
e5f9654e50
|
honour Groups:View permission in monitor filters
|
2021-03-12 11:33:16 -05:00 |
|
Isaac Connor
|
62cfdd8d61
|
fix searching in snapshots
|
2021-03-12 10:52:23 -05:00 |
|
Isaac Connor
|
b50916e02a
|
Allow unknown columns in filters. Allow specifying the table name in FilterTerm.
|
2021-03-12 10:52:10 -05:00 |
|
Isaac Connor
|
9504d8be61
|
event_ids => snapshot_ids
|
2021-03-12 10:40:23 -05:00 |
|
Isaac Connor
|
1ae1a89abf
|
Only allow show zones for System::View permission
|
2021-03-12 10:29:13 -05:00 |
|
Isaac Connor
|
ba00bee4b8
|
fix header alignment
|
2021-03-12 10:07:33 -05:00 |