15156cd62e
remove duplicated factor code, define speed so that it doesn't generate an error if not HasSpeed in Control.
2022-03-29 17:20:06 -04:00
fee0a450e5
Allow empty sort field.
2022-03-25 12:00:40 -04:00
2a17f566d6
Remove offending extra comma
2022-03-24 19:40:17 -04:00
46faec47f2
Add useful title to frame image telling us which we are looking at
2022-03-24 19:40:10 -04:00
71fe3741fb
Add filtering to Username to prevent XSS
2022-03-23 14:54:10 -04:00
ae9d2a864c
Output valid html only for Username to prevent XSS
2022-03-23 14:53:53 -04:00
b8531d63a4
Add a pattern to prevent invalid username characters
2022-03-23 14:53:38 -04:00
62c39ed0d4
Fix potential XSS from Username
2022-03-23 14:53:26 -04:00
0db629fbba
Fix potential XSS from Username
2022-03-23 14:53:07 -04:00
540748c923
Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session.
2022-03-23 14:51:39 -04:00
64770fcd46
escape html in Storage names
2022-03-23 14:51:14 -04:00
aaf391fc65
Include EndDateTimeShort in event ajax response
2022-02-17 13:32:36 -05:00
8822463ac7
Handle empty endtime more gracefully. If there is a next event just jump to it.
2022-02-17 13:32:10 -05:00
9cc17024c5
Include EndDateTimeShort in event stats
2022-02-17 13:31:57 -05:00
687818e1ec
Convert Fatal()s to Errors() which is really more appropriate anyways. Maybe Fixes #3426
2022-02-08 18:11:33 -05:00
3abacfa488
Change title of settings button to give an indication WHY it isn't enabled
2022-02-08 17:51:21 -05:00
2396e98fb9
detaint language file.
2022-02-08 14:17:30 -05:00
6268652520
Test for valid language file when saving user.
2022-02-08 14:16:50 -05:00
b10bb9d8b0
Use getBodyTopHTML so that we get error messages in UI
2022-02-08 13:37:39 -05:00
2b0398b35a
Change the error message banner to always take up space and be seen.
2022-02-08 13:37:39 -05:00
5b9ccc6889
Implement a check on change of language. Make sure that the specified language file exists. Reports errors to UI
2022-02-08 13:37:39 -05:00
df16099463
Default limit to 0 which means no limit
2022-02-02 11:02:34 -05:00
b28f97c5c3
Implement filter limits. Which go before pagination/advanced search limits
2022-02-02 10:50:28 -05:00
8891feec74
Fix missing text-right align on Port/Path labels. Set step to 1 for Port
2022-01-24 18:31:31 -05:00
42d5101f08
Make Remote Host 100%
2022-01-24 18:31:05 -05:00
01030e9850
Preface Debug with ZM
2022-01-13 22:15:29 -05:00
bfbba5474f
Add auth relay to status ajax request. clear statusTimer instead of streamTimer
2021-12-10 16:37:46 -05:00
756aa56710
Detect group hierarchy loops and break them.
2021-12-03 13:27:05 -05:00
9764875449
Move init of ctx up before we setup the monitors. I think in some cases we can calls functions that assume ctx has a value. Uncaught%20TypeError%3A%20Cannot%20read%20properties%20of%20undefined%20(reading%20'getImageData')
2021-11-29 13:55:23 -05:00
0f476998d4
kill the background timer when switching to history so that we don't cause a javascript error. comment out debugging and use native javascript instead of jquery.
2021-11-29 13:54:42 -05:00
5adf5dab50
Remove text-nowrap from cause/notes column
2021-11-29 13:53:50 -05:00
4030fa8bc4
Fix NULL and add special 0 case for Storage area specification in filter
2021-11-29 13:51:50 -05:00
c14d7889a5
Fix task=>action so that deleting works. Pause streaming before delete to prevent errors being logged due to missing files
2021-11-29 13:48:44 -05:00
a0b60aa4f7
Restore inclusion of video files in export when not including images. Fixes #3324
2021-11-17 11:04:48 -05:00
cb8ccaaa49
Set to never timeout while generating video
2021-11-16 15:00:04 -05:00
498d565034
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-16 15:00:04 -05:00
51e7aa0983
Fix use of thisUrl instead of monitorUrl when getting stream status. Fix changing stream image due to use of jquery.
2021-11-16 15:00:04 -05:00
f8e6fae013
spacing and check for permission to view the specific event instead of events in general
2021-11-16 15:00:04 -05:00
4b08b0ae84
Add title to Download button
2021-11-16 15:00:04 -05:00
d5f9eb11c6
WHen saving v4l settings redirect back to watch instead of console.
2021-11-16 15:00:04 -05:00
1b3e0eda13
dbError is supposed to take the sql that caused the error. So pass something to satisfy php
2021-11-16 15:00:04 -05:00
90e3345440
implement Event::canEdit
2021-11-16 15:00:04 -05:00
29fe7f76a2
implement UrlToZMS in Monitor
2021-11-16 15:00:04 -05:00
fa533d04ff
Send all stats rows instead of just 1. Handle receiving all rows, and don't list event id and frame id
2021-11-16 15:00:04 -05:00
bbf1269e6f
remove extra ,
2021-11-16 15:00:04 -05:00
601df481ed
Add privacy to options tabs so we can get back to it.
2021-11-16 15:00:04 -05:00
00919314e7
Report error if sql fails. Add check for access to specific event.
2021-11-09 10:51:29 -05:00
55e739d4ea
Whitespace
2021-11-09 10:51:16 -05:00
dd542d5b30
alert error message is an error is returned instead of rows
2021-11-09 10:50:55 -05:00
2aa7293326
Fix event listing when not paginated.
2021-11-02 17:23:46 -04:00
7fd8efeaef
is no longer in existence
2021-10-28 15:17:33 -04:00
94752e0cf3
Make delete dialog disappear on success. Fixes #3377
2021-10-28 15:15:24 -04:00
bd8ed71ffc
Remove debugging
2021-10-28 15:11:42 -04:00
e344141222
merge fix from master for filters not deleting
2021-10-28 15:10:55 -04:00
8061b4f71d
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-10-28 14:41:19 -04:00
198d9c0f5a
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-10-28 14:37:47 -04:00
bf7c13558c
Always include the download button so that we can assume that it exists in the js. So avoid console errors when no mp4.
2021-10-28 14:37:19 -04:00
615ce5d4c2
Set rows on email textarea
2021-10-28 14:36:06 -04:00
649eec4dae
Update italian (it_it) translation ( #3357 )
2021-10-28 14:35:29 -04:00
0dbcd680df
Update it_it.php
2021-10-28 14:35:16 -04:00
64b60613d8
Update it_it.php
2021-10-28 14:35:08 -04:00
8600a0af87
Add some extra parenthesis to make sure the logic works right
2021-10-28 13:21:50 -04:00
67504b4f39
Put back generate video button
2021-10-28 13:16:59 -04:00
7568dd63ed
add js to manage the generate video button
2021-10-28 13:15:27 -04:00
33a067c085
fix validInt to take negative integers. Introduce validCardinal to handle positive integers
2021-10-28 13:11:44 -04:00
65418abf98
Add sort_asc, sort_field and limit to the filter QueryString
2021-10-28 13:10:37 -04:00
9da9d1840c
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 13:09:41 -04:00
d03365c9e7
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-28 13:09:31 -04:00
48494a22db
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-28 13:09:00 -04:00
1f75af7534
add licensing info for fontawesome.
2021-10-28 13:08:29 -04:00
6e68a35861
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
2021-10-28 11:59:23 -04:00
22f398dd6f
set vertical-align:top on monitor edit labels
2021-10-25 16:55:42 -04:00
7517bdc6ec
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2021-10-25 16:44:01 -04:00
b2e1f7ed56
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-19 13:17:00 -04:00
a1a8f4d09b
remove debug hello
2021-10-19 13:11:50 -04:00
f5b54caa61
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-19 13:11:31 -04:00
41d193afe3
Fix removing uneeded checked
2021-10-17 19:07:55 -04:00
ca1b7ebdc7
Test for existence of AutoEmail and AutoMessage. Fixes #3369 issue 2.
2021-10-13 11:57:58 -04:00
ff87856951
Merge pull request #3366 from haade-administrator/patch-1
...
Update translation
2021-10-06 10:36:52 -04:00
1a27ac9ab3
Handle when SERVER['HTTP_HOST'] is not set
2021-10-06 10:36:35 -04:00
d622ae9251
fix width=0px causing empty looking montage
2021-10-06 10:35:52 -04:00
f299d57a39
Fix js error in montage review when using scaled mode. Fixes #3351
2021-09-14 10:27:05 -04:00
4553592caa
Merge pull request #3352 from vezza/patch-3
...
Update it_it.php
2021-09-14 10:26:52 -04:00
ded2c86858
Update it_it translation ( #3350 )
2021-09-13 09:31:00 -04:00
8c92fa5dc3
Fix version of Crud
2021-09-09 13:26:59 -04:00
12fcae7574
canView takes a user object, not a string
2021-09-08 19:08:08 -04:00
a42786afd1
Add missing Importance member
2021-09-08 13:59:21 -04:00
4612f4ae75
add getMonitorStatuses function to return string values for status numbers
2021-09-04 09:57:56 -04:00
e529d8fcd1
add autoplay tag. Fixes #3343
2021-09-03 22:29:45 -04:00
55080da9dc
Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time.
2021-09-03 22:29:16 -04:00
be46b063c8
spacing
2021-09-03 22:28:59 -04:00
2d965e7d50
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-09-03 22:28:37 -04:00
4c213ab453
Only show thumbnail if Function is != None
2021-09-03 22:28:08 -04:00
706e2ff536
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-09-03 22:27:53 -04:00
dab9bce8f4
spacing remove dead code
2021-09-03 22:27:26 -04:00
25f6935280
Allow snapshot downloading
2021-09-03 22:26:51 -04:00
4c261eb413
Use event->canView so that events in snapshots can be exported
2021-09-03 22:26:26 -04:00
ca4ec91ef3
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-09-03 22:26:09 -04:00
30aad6ab9a
Spacing and quotes
2021-09-03 22:25:43 -04:00
bed79039f3
implement Event->canView
2021-09-03 22:25:14 -04:00
Isaac Connor
Isaac Connor
Steve Gilvarry
Andrea Vezzali
SzymekCRX
r01k