500ced2dc5
When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded
2021-08-06 19:14:43 -04:00
f2a1d06f64
Snapshot exports are now flat, without frame images
2021-08-06 13:18:31 -04:00
eecf568041
Pass exportStructure around so that it can be used to put the right filename to the jpg in the html. Fix flat zips. Fix video files being included if exportMisc is true.
2021-08-06 13:18:06 -04:00
105851b70c
Actually delete the snapshot record, not just the event connection
2021-08-06 13:17:02 -04:00
f236e25e22
Fix deleting snapshots
2021-08-06 13:11:04 -04:00
1f1678064e
Allow specifying export Structure to get a flat zip
2021-08-06 13:10:44 -04:00
222909feb3
zmu may still output results even if it encounters errors, so continue even if we have an error return status from zmu.
2021-08-05 14:48:14 -04:00
7db25a5e1b
Continue to work even if opener isn't defined, which it isn't anymore because we got rid of popups. Fixes save button on monitorprobe.
2021-08-05 14:48:14 -04:00
acdd8bb08b
Merge script sections just to remove bytes per view.
2021-08-05 14:48:14 -04:00
7dc36f67db
output an error message image when we can't load a jpeg
2021-08-05 13:30:52 -04:00
0bcbff5dd5
Turn on export functionality for snapshots
2021-08-05 13:30:52 -04:00
bed41ca44b
Support specifying the export filename by passing the export_root
2021-08-05 13:30:52 -04:00
5bc9cfaa6a
Fix styling of the shutdown button
2021-08-05 13:30:52 -04:00
cb32630dc0
Update Dark Skin to fix modal being light and some other issues
...
Fixed Modal style as per post to forums, then also fixed text area and select being white. Adjusted some other colours to work better. Console hover could be better still
2021-08-01 13:33:22 +10:00
4ff4e1f780
add Manufacturer and Model dropdown/text inputs to monitor edit view
2021-07-07 09:47:55 -04:00
54f676a501
Add ManufacturerId_onchange and ModelId_onchange to hide/show the text input for custom entry
2021-07-07 09:47:32 -04:00
c6209ce460
Store new Model and Manufacturer when saving Monitor
2021-07-07 09:47:00 -04:00
3bb2b804b3
Include Model and Manufacturer to includes in Monitor.php
2021-07-07 09:46:36 -04:00
24a77d7fb3
Add ManufacturerId to Model
2021-07-07 09:46:12 -04:00
6c3f18a347
allow option to not load the frames DB table
2021-06-27 15:55:10 -04:00
b59e911c43
Allow cakephp cache engine to be set during build
2021-06-18 12:12:01 -05:00
29fb2d3885
Add special handling of sorting by EndTime because it can be NULL. Fixes #3298
2021-06-15 10:34:33 -04:00
821031f10e
Remove some debug logging
2021-06-13 18:20:57 -04:00
af46f8cad5
Merge an old stash allowing passing an alternate buttonconfig parameter to show/get Modal
2021-06-12 12:22:15 -04:00
7878fbc878
Add a limit of 1000 when pulling sessions. Sessions table can contain hundreds of thousands of lines all relatively useless. Modals need to pop up fast.
2021-06-12 12:22:15 -04:00
fd9bef228d
It is okay to call daemonControl with function==None for command == stop. All others give a warning. Fixes monitors on other servers not stopping when set to None.
2021-06-12 12:21:44 -04:00
268da411d9
Use getStat instead of other jquery code to update the event data. Don't refresh before rename ajax finishes. Deprecate the n/a handling in getStat. Not sure why it's needed. Sync update eventData with what is returned by ajax status call. Fixes #3265
2021-06-08 16:58:51 -04:00
4a40214f73
StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event
2021-06-08 16:58:50 -04:00
55f2a7f55e
spacing
2021-06-08 16:58:50 -04:00
91892c79b1
Remove 25x and options. Browsers do not support them. Add 16x which is the max. Fixes #3284
2021-06-08 16:58:50 -04:00
2cbb24d7b9
Fixed bug in onvifprobe
...
The arguments for "/usr/bin/zmonvif-probe.pl" was always `probe 1.1,1.2 1` with the last argument always being `1` instead of the network interface name selected in the menu.
This change fixes this issue by using the selected interface name instead of the boolean return value of the `isset()` function.
2021-06-03 02:26:24 +02:00
e4d3394888
fix missing namespace on warning
2021-06-02 18:35:13 -04:00
9a03c2c16a
Default to UTC when no timezone set so that montagereview continues working. Fixes #3274
2021-06-02 18:35:13 -04:00
ed5262432f
Fix samsite support for php <= 7.2
2021-06-02 14:59:13 -04:00
f2bee0704a
LocalCamera: Remove support for V4L1
...
Kernel support for Video4Linux 1 was removed in 2.6.38 (March 2011). It's time to drop support on our side.
2021-05-31 23:29:29 +02:00
4825370a7f
Apply height css to limit height of logout modal and apply overflow:auto to add a scrollbar if needed so that we don't have to scroll to logout.
2021-05-31 10:19:58 -04:00
855a81b975
Merge branch 'release-1.36'
2021-05-28 12:29:35 -04:00
096581b7f1
add getMonitorStatuses function to return string values for status numbers
2021-05-28 12:29:30 -04:00
a4e4ebe3fd
Restore api behaviour. Add zmu output to response
2021-05-28 12:29:02 -04:00
8511d814df
Restore api behaviour. Add zmu output to response
2021-05-28 12:28:35 -04:00
225123dd11
Allow [] characters in url to work with ipv6. Fixes #3261
2021-05-26 18:50:26 -04:00
824a6dc15b
Merge branch 'release-1.36'
2021-05-25 13:17:26 -04:00
3b5de40d05
Merge pull request #3259 from gerazo/master
...
Updated Hungarian translation
2021-05-25 13:16:35 -04:00
8d783d3cd5
Merge pull request #3254 from bestlong/add-lang
...
web ui add lang (Chinese Traditional)
2021-05-25 13:15:56 -04:00
80800785be
Fix getting border width on firefox. Need to specify which border. Went a little further and split x and y axis borders in the maxfit2. Fixes #3249
2021-05-25 13:15:04 -04:00
799a0ed7ba
Merge pull request #3254 from bestlong/add-lang
...
web ui add lang (Chinese Traditional)
2021-05-25 13:12:34 -04:00
6e70eb5963
Merge pull request #3259 from gerazo/master
...
Updated Hungarian translation
2021-05-25 13:08:00 -04:00
714dd0aa9f
Updated Hungarian translation
2021-05-25 18:15:40 +02:00
cf03bb9548
Merge branch 'release-1.36'
2021-05-25 11:34:11 -04:00
9e64b912a8
Add samesite when setting cookie for skin and css
2021-05-25 11:33:28 -04:00
d59118fc47
Add redirect so that Yes I'd like to donate now goes to the zoneminder /donate website. This used to happen in javascript but got removed when it was turned into a modal.
2021-05-25 11:33:12 -04:00
6a9ed9c457
Use data-onclick instead of data-on-click-this.
2021-05-25 11:22:43 -04:00
4a1d983ff1
web ui add lang (Chinese Traditional)
2021-05-24 00:05:59 +08:00
f6fcc2144f
jquery.js doesn't exist, so link jquery.min.js instead
2021-05-22 13:59:32 -04:00
4c99baf725
Use data-onclick instead of data-on-click-this. Load form by id instead of passed in element. Fixes #3250
2021-05-22 13:59:10 -04:00
1caeb67a3e
fix behaviour of reverse and fast forward buttons. Fixes #3251
2021-05-22 13:39:42 -04:00
e16d71b9c6
spacing, code style, code comments
2021-05-22 13:39:42 -04:00
317ce7692e
fix behaviour of reverse and fast forward buttons. Fixes #3251
2021-05-22 13:38:52 -04:00
bc384d6fbe
spacing, code style, code comments
2021-05-22 11:34:09 -04:00
cb0a421d25
use latest rtspserver commit
2021-05-21 15:10:42 -05:00
eb387b5453
use latest rtspserver commit
2021-05-21 15:08:40 -05:00
0b4c35c58e
Merge pull request #3241 from connortechnology/fix_3239
...
Fix 3239
2021-05-19 20:39:42 -04:00
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
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
f6a271c90d
Merge pull request #3240 from connortechnology/fix_3237
...
fix warnings not being displayed
2021-05-19 20:32:11 -04:00
e246083be5
Add StartDateTime Attr in sort dropdown
2021-05-12 10:32:03 -04:00
363b017977
If error was unauthorized, do a reload.
2021-05-12 10:32:03 -04:00
f3b4ccf758
Fix scaling when scale to fit
2021-05-10 11:08:16 -04:00
b1ac0e61a9
put back upstream version 3.2.0 of Crud
2021-05-09 18:18:03 -04:00
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
bc11e6a95b
Include pre event count in min estimated ram use
2021-05-08 15:47:29 -04:00
da8128aba1
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-05-07 19:16:35 -04:00
ff0d6e8e0f
remove duplicated getModal and pass fid=fid to getModal
2021-05-07 15:34:08 -04:00
ea3bffb402
make getModal take additional query parameters
2021-05-07 15:33:49 -04:00
9e6367c7c3
look for 264 instead of x264
2021-05-06 17:33:04 -04:00
373fae2511
BadEncoder Params and PathNotEncoded are warnings, not errors
2021-05-06 11:05:05 -04:00
b8f0d90000
Put back Estimated Ram Use. Rework it to provide min/max
2021-05-06 10:17:46 -04:00
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
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
ed97ff495b
Unhide Codec, hide OutputContainer
2021-05-05 16:48:01 -04:00
09e5c47f3e
Hide COntainer and OutputCodec options. I don't want people playing with them righ tnow.
2021-05-05 14:03:38 -04:00
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
6d07c7ce9f
specify the invalid characters
2021-05-04 15:56:47 -04:00
0b6e414998
Enable/Disable Snapshots based on ZM_FEATURES_SNAPSHOTS config setting
2021-05-04 13:19:40 -04:00
24d9bfa257
Add a test for invalid characters in Path for Ffmpeg monitors
2021-05-04 10:45:27 -04:00
b10b2932ee
Code spacing and doc
2021-05-03 15:20:11 -04:00
d92c95a420
if analysis frame doesn't exist revert back to capt
2021-05-03 15:18:35 -04:00
44e8107cac
Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead
2021-05-02 13:38:06 -04:00
b70cd053d6
spacing and quotes
2021-05-02 12:43:17 -04:00
b84efac0e5
left align Server head
2021-04-28 19:00:15 -04:00
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
953882a6da
Dirty hack to fix up/down arrows on pagination number input
2021-04-27 16:31:25 -04:00
0213c67236
add MinSectionLength
2021-04-27 15:25:09 -04:00
7901950c48
spacing
2021-04-26 09:40:08 -04:00
4385076e66
Fix encrypting password when saving User
2021-04-26 09:40:08 -04:00
02a1ecee6f
Remove dbeug
2021-04-26 09:40:08 -04:00
1dbfa0790a
web: fix eslint errors
2021-04-24 01:42:13 +02:00
9254c99ab8
Add ModectDuringPTZ
2021-04-23 14:52:29 -04:00
f4837d72ee
add text for ModectDuringPTZ
2021-04-23 14:52:29 -04:00
f59904ea7e
Add ModectDuringPTS checkbox on Control tab
2021-04-23 14:52:29 -04:00
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
37e0f010e3
Require session to be instantiated
2021-04-23 09:08:48 -04:00
15a769bcd1
add hashing of passwords on user save
2021-04-23 09:07:50 -04:00
e01533af7f
Add users to routes
2021-04-23 08:52:55 -04:00
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
354a3d9f09
Add on-mouseup and on-mousedown processing
2021-04-21 12:20:06 -04:00
79cede7cac
Merge branch 'release-1.34'
2021-04-20 09:24:49 -04:00
c0eb790e45
Fix colour shift in Crop function due to not multiplying x position by colours
2021-04-19 17:29:31 -04:00
70313ce152
Revert "Add on-mouseup and on-mousedown processing"
...
This reverts commit e0c0598e13
2021-04-19 17:15:35 -04:00
ffb2d937e1
Revert "Use on-mousedown and on-mouseup if doing continuous"
...
This reverts commit d7fa28142f
2021-04-19 17:15:20 -04:00
aaa1309377
Use > instead of >= to fix duplicated log entries display
2021-04-19 17:14:51 -04:00
80835614d5
Define timeout
2021-04-19 15:49:06 -04:00
1a5d87b3b8
Add GetCurrentLocation
2021-04-19 15:45:55 -04:00
506e5f84c9
Remove getCurrentLocation label that says Longitude
2021-04-19 15:45:18 -04:00
df26c25ac9
Add continuous mouseup/down functionailty for Zoom,White,Iris,Focus
2021-04-17 16:32:06 -04:00
d598edc7df
Implement duplicate RTSPSTreamName check
2021-04-17 12:50:26 -04:00
23f1b68e8a
Merge branch 'continuous' into cont_mast
2021-04-16 11:28:10 -04:00
f3ea08c4a1
Merge branch 'continuous' into cont_mast
2021-04-16 11:27:48 -04:00
3d1b0e2724
Apply onmouseup/down to other ptz buttons
2021-04-16 11:27:08 -04:00
c880618d5f
If no button is associated with the event, assume it is a mouseup
2021-04-16 10:24:48 -04:00
e0c0598e13
Add on-mouseup and on-mousedown processing
2021-04-16 10:15:57 -04:00
d7fa28142f
Use on-mousedown and on-mouseup if doing continuous
2021-04-16 10:15:07 -04:00
113e495a7d
Fix margin in ptz buttons
2021-04-14 14:00:24 -04:00
24cfc8583f
Include auth relay in getNavBar request. COOKIES will expire so we need this.
2021-04-14 13:00:16 -04:00
95249d5eb4
Merge branch 'release-1.34'
2021-04-12 16:32:57 -04:00
3921231cd5
Use some styles for user view to split it into two columns
2021-04-12 16:00:11 -04:00
3335976cba
implement remote api Trigger support.
2021-04-12 15:59:31 -04:00
007dce45fb
Add disable alarms as an alarm command
2021-04-12 15:59:31 -04:00
29e91f48e6
Use Snapshots permission instead of Events for snapshots
2021-04-12 15:59:31 -04:00
b125b5d370
Allow users with snapshot::view to view the snapshot image of an event
2021-04-12 15:59:31 -04:00
04cc8ed34f
Split user info into two columns
2021-04-12 15:59:31 -04:00
f3773a89ad
Add Snpahot permission
2021-04-12 15:59:31 -04:00
f59a72a638
Use Snapshots permission instead of Events permission for Snapshots
2021-04-12 15:59:31 -04:00
1b50314f9e
Add DisableAlarms function
2021-04-12 15:59:31 -04:00
7e579fd851
Implement Snapshots user permission
2021-04-12 15:59:31 -04:00
a07374e206
Fix password getting unset in global user object. Add Snapshots to user permissions
2021-04-12 15:59:31 -04:00
7aa625ea8e
Don't both loading all the Object code until after auth.
2021-04-12 15:59:31 -04:00
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
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
64ab6dff95
fix missing )
2021-04-10 18:16:59 -04:00
cf721ae875
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2021-04-10 18:16:17 -04:00
1ccc416224
Merge branch 'release-1.34'
2021-04-09 20:00:47 -04:00
1ccb8d7aef
Include Event Summaries when loading Monitors
2021-04-09 19:46:57 -04:00
3dcb71933e
Add event summary fields to Monitor Object
2021-04-09 19:46:25 -04:00
2b1e0df6be
FIx auth= not getting updated
2021-04-09 18:46:41 -04:00
492a352bed
Use updated auth_hash when sending alarm requests
2021-04-09 18:33:32 -04:00
2e22cd5c3b
Mark snapshot events as Archived
2021-04-08 15:20:44 -04:00
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
2d64c616ba
Add help for BadEncoderParameters
2021-04-01 11:53:57 -04:00
73082a2d33
Remove the H264/X264 from the dropdown labels. Could be H265 or other
2021-04-01 11:53:57 -04:00
Isaac Connor
Steven Gilvarry
Isaac Connor
Pliable Pixels
Andrew Bauer
Xulunix
Peter Keresztes Schmidt
Zoltan Gera
Shao Yu-Lung (Allen)
root