Andrea Vezzali
c4a49721d2
Update it_it.php
2021-09-25 20:56:33 -04:00
Andrea Vezzali
4b4152b837
Update it_it translation ( #3350 )
2021-09-25 20:56:33 -04:00
Isaac Connor
94c1b3445d
Add an input for an Id to assign to the new monitor. List 10 available Ids.
2021-09-25 20:54:35 -04:00
Isaac Connor
292b3c1d37
add an ajax request for querying the available models
2021-09-25 20:49:53 -04:00
Isaac Connor
c66489fb30
rough in api support for Models and Manufacturers
2021-09-25 20:49:30 -04:00
Isaac Connor
d98d20958c
fixup the Manufacturer and Model ddms and text inputs
2021-09-25 20:48:43 -04:00
Isaac Connor
fe72056d73
fixup populating Models dropdown after Manufacturer select
2021-09-25 20:48:14 -04:00
Isaac Connor
34d9f87d6d
remove cruft from ServersController.php
2021-09-25 20:44:16 -04:00
Isaac Connor
12783f6edf
Add manufacturers, models and servers routes
2021-09-25 20:43:53 -04:00
Isaac Connor
03892796eb
whitespace
2021-09-25 16:10:50 -04:00
Isaac Connor
2f12615f08
assign REQUEST['newMonitor'] to a variable to simplify code. Fixup ModelId and ManufacturerId saving.
2021-09-25 10:33:16 -04:00
Isaac Connor
7ca7d40b6f
Add defaults for ModelId and ManufacturerId. Fixes the methods for loading them
2021-09-25 10:32:04 -04:00
Isaac Connor
1cb9f98e9b
Restore the download button's behaviour. It is a simple link to the mp4, not an export. Also add a handler for the video.js rate control to sync up our non video.js rate dropdown and stored cookie.
2021-09-21 13:01:05 -04:00
Isaac Connor
160f775f91
Always include the download button so that we can assume that it exists in the js. So avoid console errors when no mp4.
2021-09-21 13:01:05 -04:00
Isaac Connor
dd6adc08a8
Set rows on email textarea
2021-09-21 13:01:05 -04:00
Andrea Vezzali
2724a238e1
Update italian (it_it) translation ( #3357 )
2021-09-20 14:02:35 +02:00
Isaac Connor
7aa955abd2
Fix js error in montage review when using scaled mode. Fixes #3351
2021-09-14 10:26:17 -04:00
Andrea Vezzali
3e5d377f7a
Update it_it.php
2021-09-14 15:39:53 +02:00
Andrea Vezzali
966749ff86
Update it_it.php
2021-09-14 15:16:25 +02:00
Andrea Vezzali
97c10fc135
Update it_it translation ( #3350 )
2021-09-13 13:28:48 +02:00
Isaac Connor
15adc47c61
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-10 18:24:44 -04:00
Isaac Connor
009b3ceffc
Fix version of Crud
2021-09-09 13:28:25 -04:00
Isaac Connor
e18f8019b0
canView takes a user object, not a string
2021-09-08 19:07:51 -04:00
Isaac Connor
227e5794fa
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-08 18:32:46 -04:00
Isaac Connor
b2415643f6
Add missing Importance member
2021-09-08 13:57:46 -04:00
Peter Keresztes Schmidt
6e96cbe14a
Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2
2021-09-08 00:19:08 +02:00
Isaac Connor
d102732a7e
add autoplay tag. Fixes #3343
2021-08-29 09:44:04 -04:00
Isaac Connor
dbe16a9cb4
Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time.
2021-08-26 10:45:36 -04:00
Isaac Connor
2640791b89
spacing
2021-08-23 18:13:19 -04:00
r01k
79e041d0f0
Fixed bug that caused 'Call to undefined function Error()' in control_functions.php. Exception was being raised due to logger.php not being included in control_functions.php.
2021-08-20 22:42:57 -04:00
Isaac Connor
4a5bc88882
Always set image width to 100%. it should fill it's div and we will set the width of the div.
2021-08-19 18:57:00 -04:00
Isaac Connor
68a7635d9b
Only show thumbnail if Function is != None
2021-08-19 18:40:50 -04:00
Isaac Connor
7a6c244aa7
spacing. When the selected layout is not freeform, calculate the ratio of computed size to stream source size to calculate a value for scale.
2021-08-19 16:05:43 -04:00
Isaac Connor
44823e0c94
spacing remove dead code
2021-08-18 18:40:25 -04:00
Isaac Connor
8ddec91870
Allow snapshot downloading
2021-08-18 10:53:59 -04:00
Isaac Connor
7127a944a1
Use event->canView so that events in snapshots can be exported
2021-08-18 10:53:59 -04:00
Isaac Connor
ba9a871daf
Move CSP stuff down to view parsing. ajax requests only output json, so CSP shouldn't be relevant. Only end output buffer if there is one. archive view for example clears all output buffers.
2021-08-18 10:53:59 -04:00
Isaac Connor
eb1124c406
Spacing and quotes
2021-08-18 10:53:59 -04:00
Isaac Connor
b9efe627f3
implement Event->canView
2021-08-18 10:53:59 -04:00
Isaac Connor
e7e8996060
Can export events if canView Snapshots. Event->canView will filter events that are not in a snapshot
2021-08-18 10:53:59 -04:00
Isaac Connor
c12d88d874
Use canView.Snapshots for snapshot permissions instead of canView.Events
2021-08-18 10:53:59 -04:00
Isaac Connor
301d8fa5fa
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-08-18 10:53:59 -04:00
Isaac Connor
92a924044a
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-08-12 13:44:49 -04:00
Isaac Connor
a311455526
clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save.
2021-08-12 13:42:36 -04:00
Isaac Connor
cd3359c3eb
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-08-12 12:53:46 -04:00
Isaac Connor
066bb891af
Fix url to ajax endpoint for deleting snapshots.
2021-08-06 19:18:27 -04:00
Isaac Connor
f0b2f75d91
Cleanup, split export and download functions in snapshot.
2021-08-06 19:18:02 -04:00
Isaac Connor
672de6e84f
event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it.
2021-08-06 19:15:22 -04:00
Isaac Connor
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
Isaac Connor
f2a1d06f64
Snapshot exports are now flat, without frame images
2021-08-06 13:18:31 -04:00
Isaac Connor
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
Isaac Connor
105851b70c
Actually delete the snapshot record, not just the event connection
2021-08-06 13:17:02 -04:00
Isaac Connor
f236e25e22
Fix deleting snapshots
2021-08-06 13:11:04 -04:00
Isaac Connor
1f1678064e
Allow specifying export Structure to get a flat zip
2021-08-06 13:10:44 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
acdd8bb08b
Merge script sections just to remove bytes per view.
2021-08-05 14:48:14 -04:00
Isaac Connor
7dc36f67db
output an error message image when we can't load a jpeg
2021-08-05 13:30:52 -04:00
Isaac Connor
0bcbff5dd5
Turn on export functionality for snapshots
2021-08-05 13:30:52 -04:00
Isaac Connor
bed41ca44b
Support specifying the export filename by passing the export_root
2021-08-05 13:30:52 -04:00
Isaac Connor
5bc9cfaa6a
Fix styling of the shutdown button
2021-08-05 13:30:52 -04:00
Steven Gilvarry
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
Isaac Connor
4ff4e1f780
add Manufacturer and Model dropdown/text inputs to monitor edit view
2021-07-07 09:47:55 -04:00
Isaac Connor
54f676a501
Add ManufacturerId_onchange and ModelId_onchange to hide/show the text input for custom entry
2021-07-07 09:47:32 -04:00
Isaac Connor
c6209ce460
Store new Model and Manufacturer when saving Monitor
2021-07-07 09:47:00 -04:00
Isaac Connor
3bb2b804b3
Include Model and Manufacturer to includes in Monitor.php
2021-07-07 09:46:36 -04:00
Isaac Connor
24a77d7fb3
Add ManufacturerId to Model
2021-07-07 09:46:12 -04:00
Pliable Pixels
6c3f18a347
allow option to not load the frames DB table
2021-06-27 15:55:10 -04:00
Andrew Bauer
b59e911c43
Allow cakephp cache engine to be set during build
2021-06-18 12:12:01 -05:00
Isaac Connor
29fb2d3885
Add special handling of sorting by EndTime because it can be NULL. Fixes #3298
2021-06-15 10:34:33 -04:00
Isaac Connor
821031f10e
Remove some debug logging
2021-06-13 18:20:57 -04:00
Isaac Connor
af46f8cad5
Merge an old stash allowing passing an alternate buttonconfig parameter to show/get Modal
2021-06-12 12:22:15 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
4a40214f73
StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event
2021-06-08 16:58:50 -04:00
Isaac Connor
55f2a7f55e
spacing
2021-06-08 16:58:50 -04:00
Isaac Connor
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
Xulunix
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
Isaac Connor
e4d3394888
fix missing namespace on warning
2021-06-02 18:35:13 -04:00
Isaac Connor
9a03c2c16a
Default to UTC when no timezone set so that montagereview continues working. Fixes #3274
2021-06-02 18:35:13 -04:00
Isaac Connor
ed5262432f
Fix samsite support for php <= 7.2
2021-06-02 14:59:13 -04:00
Peter Keresztes Schmidt
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
Isaac Connor
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
Isaac Connor
855a81b975
Merge branch 'release-1.36'
2021-05-28 12:29:35 -04:00
Isaac Connor
096581b7f1
add getMonitorStatuses function to return string values for status numbers
2021-05-28 12:29:30 -04:00
Isaac Connor
a4e4ebe3fd
Restore api behaviour. Add zmu output to response
2021-05-28 12:29:02 -04:00
Isaac Connor
8511d814df
Restore api behaviour. Add zmu output to response
2021-05-28 12:28:35 -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
824a6dc15b
Merge branch 'release-1.36'
2021-05-25 13:17: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
799a0ed7ba
Merge pull request #3254 from bestlong/add-lang
...
web ui add lang (Chinese Traditional)
2021-05-25 13:12:34 -04:00
Isaac Connor
6e70eb5963
Merge pull request #3259 from gerazo/master
...
Updated Hungarian translation
2021-05-25 13:08:00 -04:00
Zoltan Gera
714dd0aa9f
Updated Hungarian translation
2021-05-25 18:15:40 +02:00
Isaac Connor
cf03bb9548
Merge branch 'release-1.36'
2021-05-25 11:34:11 -04:00
Isaac Connor
9e64b912a8
Add samesite when setting cookie for skin and css
2021-05-25 11:33:28 -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
Shao Yu-Lung (Allen)
4a1d983ff1
web ui add lang (Chinese Traditional)
2021-05-24 00:05:59 +08: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
Isaac Connor
317ce7692e
fix behaviour of reverse and fast forward buttons. Fixes #3251
2021-05-22 13:38:52 -04:00
Isaac Connor
bc384d6fbe
spacing, code style, code comments
2021-05-22 11:34:09 -04:00
Andrew Bauer
cb0a421d25
use latest rtspserver commit
2021-05-21 15:10:42 -05:00
Andrew Bauer
eb387b5453
use latest rtspserver commit
2021-05-21 15:08:40 -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
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