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
Andrew Bauer
Isaac Connor
Xulunix
Peter Keresztes Schmidt
Isaac Connor
Zoltan Gera
Shao Yu-Lung (Allen)