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
e3d2b14b69
Don't exit(0) on QUIT. Instead set zm_terminate=true so that all the cleanup routines run.
2021-11-09 15:49:25 -05:00
9b723d73a1
Set zm_terminate on crash so that other threads exit instead of continuing
2021-11-09 10:51:39 -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
5d93e9a957
av_write_trailer can return a positive value which is not an error
2021-11-02 17:24:54 -04:00
2aa7293326
Fix event listing when not paginated.
2021-11-02 17:23:46 -04:00
84b8e43034
Only start a transaction if we are not already in a transaction
2021-10-28 15:28:55 -04:00
15a7c22b94
layout->layer
2021-10-28 15:26:12 -04:00
d7abdb1505
Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path.
2021-10-28 15:18:55 -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
06f1ab4d46
Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it.
2021-10-28 13:19:43 -04:00
42ab65f7a0
Merge pull request #3361 from criadoperez/debian-install
...
Added Debian 11 (bullseye) installation instructions
2021-10-28 13:17:38 -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
2de36f01db
Handle auth to mysql problems more gracefully
2021-10-28 13:15:18 -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
0dc9017472
reset starttime when changing events. Fixes super fast playback after switch to next event. Also, skip some unneeded calculations and logging.
2021-10-28 13:02:58 -04:00
ee30c0f05e
add a comment about rollbacks
2021-10-28 12:03:58 -04:00
a6795cd026
Just return the error
2021-10-28 11:59:36 -04:00
6e68a35861
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
2021-10-28 11:59:23 -04:00
dd758aacac
Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it.
2021-10-27 12:21:30 -04:00
8893a29b51
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2021-10-25 17:06:40 -04:00
1ab58aabc6
Bump version to 1.36.10
2021-10-25 17:05:06 -04:00
4b5bc09c41
Merge new logic from master. We now delete a non-keyframe from head instead of waiting in capture.
2021-10-25 17:03:36 -04:00
22f398dd6f
set vertical-align:top on monitor edit labels
2021-10-25 16:55:42 -04:00
d4467dba36
Fix logic ordering in 1.35.14 updated that moves columns from Monitors table to Monitor_Status
2021-10-25 16:55:42 -04:00
c600725a1a
Fix monitor type labels by adding an Unknown for entry 0. Implement Function_Strings. Fix decoding_enabled not being recalculated correctly because we havn't loaded savejpegs or videowriter yet.
2021-10-25 16:44:09 -04:00
Isaac Connor
ColorfullyZhang
Isaac Connor
Steve Gilvarry
Andrea Vezzali
SzymekCRX