391fc1fec8
Use canView.Snapshots for snapshot permissions instead of canView.Events
2021-09-03 22:23:09 -04:00
a1fe4e2638
Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated.
2021-09-03 22:22:47 -04:00
a2f3583481
turn Save, SaveAs and Execute into submit buttons. Put Id into the form action so that it shows up in the url bar. Disable putting the form contents into the url bar in parse_rows.
2021-09-03 22:22:16 -04:00
809183716a
clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save.
2021-09-03 22:21:40 -04:00
3ca920f1a9
spacing. Add defaults for AutoMoveTo and AutoCopyTo so that we don't get false changes. redirect is a global, so make it so. Re-null the Id of the filter object after temp execute so that we don't reference a no longer existing filter.
2021-09-03 22:21:21 -04:00
2e09334b9c
Fix url to ajax endpoint for deleting snapshots.
2021-09-03 22:20:51 -04:00
a69882ffaf
Cleanup, split export and download functions in snapshot.
2021-09-03 22:20:27 -04:00
b306f92116
event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it.
2021-09-03 22:19:57 -04:00
ae1e3d88b2
When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded
2021-09-03 22:19:39 -04:00
cf87f2cc40
Snapshot exports are now flat, without frame images
2021-09-03 22:19:19 -04:00
c089702fab
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-09-03 22:19:02 -04:00
2c7af3886c
Actually delete the snapshot record, not just the event connection
2021-09-03 22:18:38 -04:00
2f7c44dce2
Fix deleting snapshots
2021-09-03 22:18:24 -04:00
ad9ce720fd
Allow specifying export Structure to get a flat zip
2021-09-03 22:18:06 -04:00
50326cf80c
zmu may still output results even if it encounters errors, so continue even if we have an error return status from zmu.
2021-09-03 22:17:15 -04:00
c280279cf7
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-09-03 22:16:30 -04:00
6a6d6935e8
Merge script sections just to remove bytes per view.
2021-09-03 22:15:56 -04:00
814e8559aa
output an error message image when we can't load a jpeg
2021-09-03 22:15:29 -04:00
8d5207636a
Turn on export functionality for snapshots
2021-09-03 22:15:08 -04:00
2273deaf17
Support specifying the export filename by passing the export_root
2021-09-03 22:14:42 -04:00
06ff94de2f
Fix styling of the shutdown button
2021-09-03 22:13:55 -04:00
59a03d6d59
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-09-03 22:13:26 -04:00
17ec2f922e
Remove some debug logging
2021-09-03 22:11:51 -04:00
6d9c582e13
Merge an old stash allowing passing an alternate buttonconfig parameter to show/get Modal
2021-09-03 22:11:14 -04:00
0b76892ddf
Merge pull request #3307 from pliablepixels/optimize-event-api
...
API: allow option to not load the frames DB table
2021-07-05 12:49:58 -04:00
a423f2620e
Allow cakephp cache engine to be set during build
2021-06-18 15:29:54 -05:00
0ca10fe7cd
Add special handling of sorting by EndTime because it can be NULL. Fixes #3298
2021-06-15 10:34:15 -04:00
bb67c27d3b
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:22:42 -04:00
3141ec32fe
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 11:58:18 -04:00
2288d32928
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 15:58:17 -04:00
131e57a99e
StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event
2021-06-08 15:54:14 -04:00
16295598dc
spacing
2021-06-08 15:53:35 -04:00
13da1aca14
Remove 25x and options. Browsers do not support them. Add 16x which is the max. Fixes #3284
2021-06-08 13:37:40 -04:00
a5341beaa5
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-08 13:12:35 -04:00
4f3552a3e9
fix missing namespace on warning
2021-06-08 13:11:40 -04:00
959107f318
Default to UTC when no timezone set so that montagereview continues working. Fixes #3274
2021-06-08 13:11:06 -04:00
74b48c9f21
Fix samsite support for php <= 7.2
2021-06-08 13:09:43 -04:00
f85efc17b4
Add samesite when setting cookie for skin and css
2021-06-08 13:09:30 -04:00
9f6eec792c
Fix Crud fork
2021-06-08 13:01:09 -04:00
f723b39cf6
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-30 18:31:26 -04:00
a4e4ebe3fd
Restore api behaviour. Add zmu output to response
2021-05-28 12:29:02 -04:00
225123dd11
Allow [] characters in url to work with ipv6. Fixes #3261
2021-05-26 18:50: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
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
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
cb0a421d25
use latest rtspserver commit
2021-05-21 15:10:42 -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
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
Isaac Connor
Steven Gilvarry
Isaac Connor
Andrew Bauer
Xulunix
Peter Keresztes Schmidt