Isaac Connor
4945a016cf
Restore inclusion of video files in export when not including images. Fixes #3324
2021-11-17 11:04:28 -05:00
Isaac Connor
03897bf68e
Add privacy to options tabs so we can get back to it.
2021-11-16 09:49:49 -05:00
Isaac Connor
78a803abf8
Add Model and Manufacturer to telemetry listing
2021-11-16 09:47:34 -05:00
Isaac Connor
71c29afa7b
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-15 09:47:34 -05:00
Isaac Connor
c84f42e280
Set to never timeout while generating video
2021-11-12 15:11:48 -05:00
Isaac Connor
8872b8be63
spacing
2021-11-12 15:11:48 -05:00
Isaac Connor
795c5bb7d7
setScale to auto
2021-11-12 15:11:48 -05:00
Isaac Connor
ac03a88550
Include url_to_zms in monitorData
2021-11-12 15:11:48 -05:00
Isaac Connor
529e889d99
remove extra ,
2021-11-12 15:11:48 -05:00
Isaac Connor
14e578cdb2
Implement Exit Fullscreen using same button
2021-11-12 15:11:48 -05:00
Isaac Connor
a7fd65d844
Put SCALE_BASE in skin.js.php as it is used in many places.
2021-11-12 15:11:48 -05:00
Isaac Connor
6f3e22f2a0
If no bottom element is specified, take the last child of content in scaleToFit
2021-11-12 15:11:48 -05:00
Isaac Connor
8d0463bbff
Implement getElement, setScale in MonitorStream.js
2021-11-12 15:11:48 -05:00
Isaac Connor
98e29e7ef6
implement UrlToZMS in Monitor
2021-11-12 15:11:48 -05:00
Isaac Connor
dc9f7b4d1d
Rough in fullscreen mode on montage
2021-11-12 15:11:48 -05:00
Isaac Connor
acff4fb9c0
rough in fullscreen mode in watch view
2021-11-12 15:11:48 -05:00
Isaac Connor
71931f007a
alert error message is an error is returned instead of rows
2021-11-12 15:11:48 -05:00
Isaac Connor
944c04e5b4
Whitespace
2021-11-12 15:11:48 -05:00
Isaac Connor
9036728bdc
Report error if sql fails. Add check for access to specific event.
2021-11-12 15:11:48 -05:00
Isaac Connor
3ac5402699
Pretty up the v4l field names
2021-11-12 15:11:48 -05:00
Isaac Connor
caeaf91cad
Only list available ids if there are some
2021-11-12 15:11:48 -05:00
Isaac Connor
1561adbef9
Add title to Download button
2021-11-12 15:11:41 -05:00
Isaac Connor
193f349e38
implement Event::canEdit
2021-11-12 13:37:01 -05:00
Isaac Connor
6d30f5431b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-11-11 13:58:56 -05:00
Isaac Connor
a0215067e4
In multi-server when viewing an event it may be coming from a different server than the serverhost. Use monitorUrl instead of thisUrl in ajax calls and include auth data. Fixes failed ajax when viewing h264 using zms on a multi-server environment
2021-11-11 13:58:52 -05:00
Isaac Connor
721769993b
Set to never timeout while generating video
2021-11-10 17:05:46 -05:00
Isaac Connor
2c0c257d76
spacing
2021-11-10 14:25:45 -05:00
Isaac Connor
0732d4c1b3
setScale to auto
2021-11-10 14:25:29 -05:00
Isaac Connor
377219befe
Include url_to_zms in monitorData
2021-11-10 14:25:12 -05:00
Isaac Connor
ed84b59671
remove extra ,
2021-11-10 14:23:36 -05:00
Isaac Connor
5d0bd978e4
Implement Exit Fullscreen using same button
2021-11-10 14:22:05 -05:00
Isaac Connor
43c1886267
Put SCALE_BASE in skin.js.php as it is used in many places.
2021-11-10 14:21:38 -05:00
Isaac Connor
b8f6172110
If no bottom element is specified, take the last child of content in scaleToFit
2021-11-10 14:21:12 -05:00
Isaac Connor
474f65cff3
Implement getElement, setScale in MonitorStream.js
2021-11-10 14:20:19 -05:00
Isaac Connor
4c2d50c1f4
implement UrlToZMS in Monitor
2021-11-10 14:18:58 -05:00
Isaac Connor
f263da8986
Rough in fullscreen mode on montage
2021-11-09 17:01:13 -05:00
Isaac Connor
30d4900b45
rough in fullscreen mode in watch view
2021-11-09 17:01:13 -05:00
Isaac Connor
7abbfc2fb5
alert error message is an error is returned instead of rows
2021-11-09 13:59:14 -05:00
Isaac Connor
e617eb8615
Whitespace
2021-11-09 13:59:14 -05:00
Isaac Connor
ce81099489
Report error if sql fails. Add check for access to specific event.
2021-11-09 13:59:14 -05:00
Isaac Connor
6609c154f2
Pretty up the v4l field names
2021-11-07 11:28:34 -05:00
Isaac Connor
f737e3e945
Only list available ids if there are some
2021-11-06 09:58:31 -04:00
Isaac Connor
1fd99424bb
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-05 10:13:41 -04:00
Isaac Connor
3208059040
Fix event listing when not paginated.
2021-11-02 17:24:05 -04:00
Isaac Connor
0e3f694097
Rename bootstrap with version so we don't have to cache bust it, so that .map loading works.
2021-10-31 15:19:26 -04:00
Isaac Connor
97164fd4d7
Fix use of thisUrl instead of monitorUrl when getting stream status. Fix changing stream image due to use of jquery.
2021-10-31 14:44:36 -04:00
Isaac Connor
224b34d69d
Send all stats rows instead of just 1. Handle receiving all rows, and don't list event id and frame id
2021-10-29 18:54:23 -04:00
Isaac Connor
1168fc52a5
spacing and check for permission to view the specific event instead of events in general
2021-10-29 18:53:23 -04:00
Isaac Connor
b4314e5d46
Remove debugging
2021-10-28 15:12:24 -04:00
Isaac Connor
fee69d3bc2
is no longer in existence
2021-10-28 10:46:50 -04:00
Isaac Connor
0c157904e6
add js to manage the generate video button
2021-10-28 10:46:50 -04:00
Isaac Connor
2a160f045d
Put back generate video button
2021-10-28 10:46:50 -04:00
Isaac Connor
5955e4b410
add licensing info for fontawesome.
2021-10-28 10:46:50 -04:00
SzymekCRX
2bcad7bf5e
Critical bug in events.php
...
Two extra brackets causes fatal error in Ajax request causing 500 HTTP error and problems with listing / deleting events
2021-10-28 07:43:44 +02:00
Isaac Connor
d56de57494
set vertical-align:top on monitor edit labels
2021-10-25 16:55:23 -04:00
Isaac Connor
a55bd23bf6
Add some extra parenthesis to make sure the logic works right
2021-10-25 16:55:23 -04:00
Isaac Connor
51e77438fa
Add sort-name and sort-order to bootstrap table options. Also set data-remember-order=false. This allows orderings set by filters to work. Fixes #3348
2021-10-25 12:35:46 -04:00
Isaac Connor
0c222f66ee
Add sort_asc, sort_field and limit to the filter QueryString
2021-10-25 12:34:51 -04:00
Isaac Connor
8afed25d18
Use filter->sort_asc and sort_field which will use either the value specified in query, or defaults set in system. url params order and sort will override.
2021-10-25 12:34:28 -04:00
Isaac Connor
c6eedd434c
Make delete dialog disappear on success. Fixes #3377
2021-10-22 20:59:04 -04:00
Isaac Connor
16d0e269df
WHen saving v4l settings redirect back to watch instead of console.
2021-10-19 12:39:37 -04:00
Isaac Connor
d1596dee02
Fix removing uneeded checked
2021-10-17 19:08:12 -04:00
Isaac Connor
d960f9b6af
Fix settings being blank due to missing v4l2-ctl
2021-10-16 13:19:19 -04:00
Isaac Connor
1606f7918a
Show ram/swap usage in bytes instead of kb. Correct title of ram vs swap.
2021-10-15 09:40:58 -04:00
Isaac Connor
809cb651c0
remove debug hello
2021-10-14 17:56:16 -04:00
Isaac Connor
5f381a244f
Improvements to export. Fix tar -v, should be tar --version. make table width:100% and iframe height 100%. Always show thumbnail of video. Show Id of event if no other links. generate Images frame content event if no jpegs but there is an mp4. Set timeout to infinity for generating export. Provide more feedback if it breaks. Fix ticker.
2021-10-14 17:56:02 -04:00
Isaac Connor
d71a5932f5
Turn off useless shm display in header. Add ram and swap usage
2021-10-14 13:33:29 -04:00
Isaac Connor
452d28a66b
Turn off useless shm display in header. Add ram and swap usage
2021-10-14 13:31:35 -04:00
Isaac Connor
26ac52aaa9
Fix scaling the image after changeScale. Limit stream scale to 100, let browser do the scaling
2021-10-14 13:00:49 -04:00
Isaac Connor
00f9cb791c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-13 13:43:10 -04:00
Isaac Connor
f60282eaf5
Test for existence of AutoEmail and AutoMessage. Fixes #3369 issue 2.
2021-10-13 11:58:22 -04:00
Isaac Connor
aafec8ead6
Put actions and options in a div, remove hr's and style the resulting div have the borders and clearing required. Make email options 100%
2021-10-12 13:22:41 -04:00
Isaac Connor
0ba3d863a6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-12 12:25:01 -04:00
Isaac Connor
505f3d1b32
Merge pull request #3366 from haade-administrator/patch-1
...
Update translation
2021-10-06 09:11:22 -04:00
Isaac Connor
a465403c72
Handle when SERVER['HTTP_HOST'] is not set
2021-10-05 19:49:42 -04:00
Isaac Connor
e394248baf
Add ajax controls to realtime change the v4l2 ctrls
2021-10-05 19:49:42 -04:00
Isaac Connor
94cd3a6e69
Use v4l2-ctrl to list the available controls and display all of them. Use range sliders where appropriate.
2021-10-05 19:49:42 -04:00
Isaac Connor
c72d34f176
fix validInt to take negative integers. Introduce validCardinal to handle positive integers
2021-10-05 19:49:42 -04:00
Isaac Connor
1f04723f3a
dbError is supposed to take the sql that caused the error. So pass something to satisfy php
2021-10-05 19:49:42 -04:00
haade
a0142d3896
Update translation
2021-10-05 08:15:39 +02:00
Isaac Connor
9bbdd36252
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-28 19:44:31 -04:00
Isaac Connor
ee65d3e3dc
add cmaeramodels route
2021-09-27 10:57:06 -04:00
Isaac Connor
fe734d4e1e
Add Manufacturer and CameraModel hasOne relationships
2021-09-27 10:56:50 -04:00
Isaac Connor
1c01936f75
add oninput methods to text inputs for new Manufacturer/Model
2021-09-26 14:47:29 -04:00
Isaac Connor
ee609ad28b
Further develop behavour when typing in text input for new manufacturer or model. If it already exists, select it.
2021-09-26 14:46:56 -04:00
Steve Gilvarry
dcd2c16774
Define Date formats
...
Set Locale for time to en_GB.utf8, changed STRF_FMT_DATETIME_SHORTER to %x which is locale aware short date, but does include year. Makes event table wider, not sure if that is a problem for others
2021-09-27 00:58:34 +10:00
Isaac Connor
f40e2be28a
Add an input for an Id to assign to the new monitor. List 10 available Ids.
2021-09-25 20:56:33 -04:00
Isaac Connor
43dfeb5b84
whitespace
2021-09-25 20:56:33 -04:00
Isaac Connor
92f6d3cbae
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-25 20:56:33 -04:00
Isaac Connor
6022dd59eb
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-25 20:56:33 -04:00
Isaac Connor
4bdf965dcb
Set rows on email textarea
2021-09-25 20:56:33 -04:00
Andrea Vezzali
e75d5a89e9
Update italian (it_it) translation ( #3357 )
2021-09-25 20:56:33 -04:00
Isaac Connor
c7aa41502a
Fix js error in montage review when using scaled mode. Fixes #3351
2021-09-25 20:56:33 -04:00
Andrea Vezzali
787b7f1874
Update it_it.php
2021-09-25 20:56:33 -04:00
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