Commit Graph

7920 Commits

Author SHA1 Message Date
Isaac Connor 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
Isaac Connor cf87f2cc40 Snapshot exports are now flat, without frame images 2021-09-03 22:19:19 -04:00
Isaac Connor 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
Isaac Connor 2c7af3886c Actually delete the snapshot record, not just the event connection 2021-09-03 22:18:38 -04:00
Isaac Connor 2f7c44dce2 Fix deleting snapshots 2021-09-03 22:18:24 -04:00
Isaac Connor ad9ce720fd Allow specifying export Structure to get a flat zip 2021-09-03 22:18:06 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 6a6d6935e8 Merge script sections just to remove bytes per view. 2021-09-03 22:15:56 -04:00
Isaac Connor 814e8559aa output an error message image when we can't load a jpeg 2021-09-03 22:15:29 -04:00
Isaac Connor 8d5207636a Turn on export functionality for snapshots 2021-09-03 22:15:08 -04:00
Isaac Connor 2273deaf17 Support specifying the export filename by passing the export_root 2021-09-03 22:14:42 -04:00
Isaac Connor 06ff94de2f Fix styling of the shutdown button 2021-09-03 22:13:55 -04:00
Steven Gilvarry 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
Isaac Connor 17ec2f922e Remove some debug logging 2021-09-03 22:11:51 -04:00
Isaac Connor 6d9c582e13 Merge an old stash allowing passing an alternate buttonconfig parameter to show/get Modal 2021-09-03 22:11:14 -04:00
Isaac Connor 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
Andrew Bauer a423f2620e Allow cakephp cache engine to be set during build 2021-06-18 15:29:54 -05:00
Isaac Connor 0ca10fe7cd Add special handling of sorting by EndTime because it can be NULL. Fixes #3298 2021-06-15 10:34:15 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 131e57a99e StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event 2021-06-08 15:54:14 -04:00
Isaac Connor 16295598dc spacing 2021-06-08 15:53:35 -04:00
Isaac Connor 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
Xulunix 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
Isaac Connor 4f3552a3e9 fix missing namespace on warning 2021-06-08 13:11:40 -04:00
Isaac Connor 959107f318 Default to UTC when no timezone set so that montagereview continues working. Fixes #3274 2021-06-08 13:11:06 -04:00
Isaac Connor 74b48c9f21 Fix samsite support for php <= 7.2 2021-06-08 13:09:43 -04:00
Isaac Connor f85efc17b4 Add samesite when setting cookie for skin and css 2021-06-08 13:09:30 -04:00
Isaac Connor 9f6eec792c Fix Crud fork 2021-06-08 13:01:09 -04:00
Isaac Connor 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
Isaac Connor a4e4ebe3fd Restore api behaviour. Add zmu output to response 2021-05-28 12:29:02 -04:00
Isaac Connor 225123dd11 Allow [] characters in url to work with ipv6. Fixes #3261 2021-05-26 18:50:26 -04:00
Isaac Connor 3b5de40d05 Merge pull request #3259 from gerazo/master
Updated Hungarian translation
2021-05-25 13:16:35 -04:00
Isaac Connor 8d783d3cd5 Merge pull request #3254 from bestlong/add-lang
web ui add lang (Chinese Traditional)
2021-05-25 13:15:56 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 6a9ed9c457 Use data-onclick instead of data-on-click-this. 2021-05-25 11:22:43 -04:00
Isaac Connor f6fcc2144f jquery.js doesn't exist, so link jquery.min.js instead 2021-05-22 13:59:32 -04:00
Isaac Connor 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
Isaac Connor 1caeb67a3e fix behaviour of reverse and fast forward buttons. Fixes #3251 2021-05-22 13:39:42 -04:00
Isaac Connor e16d71b9c6 spacing, code style, code comments 2021-05-22 13:39:42 -04:00
Andrew Bauer cb0a421d25 use latest rtspserver commit 2021-05-21 15:10:42 -05:00
Isaac Connor 0b4c35c58e Merge pull request #3241 from connortechnology/fix_3239
Fix 3239
2021-05-19 20:39:42 -04:00
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