ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,816 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

19816 Commits

Author SHA1 Message Date
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 3f0bdf6332 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-10-29 18:54:47 -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 df88c5bbef layout->layer 2021-10-28 15:28:03 -04:00
Isaac Connor 4122ae99a5 add a comment about rollbacks 2021-10-28 15:27:45 -04:00
Isaac Connor b4314e5d46 Remove debugging 2021-10-28 15:12:24 -04:00
Isaac Connor e063f0715f 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:00:41 -04:00
Isaac Connor dedd755e5c Handle auth to mysql problems more gracefully 2021-10-28 12:46:42 -04:00
Isaac Connor 644c6e6b41 Just return the error 2021-10-28 11:48:08 -04:00
Isaac Connor 76b75cc69b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-10-28 10:47:02 -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 c2bd2dc129 Add a warning if db queue is larger than 10 2021-10-28 10:46:50 -04:00
Isaac Connor 9fe2762bc8 Add mp4 as an option for generated video and make it the default instead of avi 2021-10-28 10:46:50 -04:00
Isaac Connor 5955e4b410 add licensing info for fontawesome. 2021-10-28 10:46:50 -04:00
Isaac Connor d8e4a77424
Merge pull request #3361 from criadoperez/debian-install 
Added Debian 11 (bullseye) installation instructions
 2021-10-28 09:55:07 -04:00
Isaac Connor a946c45614
Merge pull request #3381 from SzymekCRX/patch-1 
Critical bug in events.php
 2021-10-28 09:13:23 -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 6478999ecf 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:03 -04:00
Isaac Connor a74b785d08 Move the protocol loading into the Monitor Object. 2021-10-26 18:15:43 -04:00
Isaac Connor a2ec18be5a Implement Control() function to implement the Protocol Specific Control object 2021-10-26 18:15:43 -04:00
Isaac Connor d62d88a0a3 add utility functions parseNameEqualsValueToHash and hash_diff 2021-10-26 18:15:43 -04:00
Isaac Connor c864d0765b Update, add url parsing to match other control scripts. Add getConfig and setConfig 2021-10-26 18:15:43 -04:00
Isaac Connor cebe86feb2 Make ZoneMinder::Control ingerit from Object. Make loadMonitor use MonitorId 2021-10-26 18:15:43 -04: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 1e38cf8bb7 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:40:21 -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 5e21d4833a Remove dead code, remove locking from CopyTo, put locking into MoveTo. 2021-10-25 11:09:29 -04:00
Isaac Connor 9169da6963 Only start a transaction if we are not already in a transaction 2021-10-25 11:09:06 -04:00
Isaac Connor c6eedd434c Make delete dialog disappear on success. Fixes #3377 2021-10-22 20:59:04 -04:00
Isaac Connor 4351f51929 Fix logic ordering in 1.35.14 updated that moves columns from Monitors table to Monitor_Status 2021-10-20 13:14:04 -04:00
Isaac Connor ccdf002c18 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-10-19 15:27:14 -04:00
Isaac Connor ac15ea42cd enforce default action 2021-10-19 14:34:17 -04:00
Isaac Connor 52f0240334 free and re-init opts as needed 2021-10-19 13:05:11 -04:00
Isaac Connor 6d7f752eb0 Only record when in modect or nodect. Linked monitors would cause a monitor in monitor mode to record 2021-10-19 13:04:49 -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 bfcc6ed13e
Merge pull request #3376 from pmuetschard/encoder_opts 
Respect the encoder options for the header write.
 2021-10-19 12:37:59 -04:00
Pascal Muetschard 14e6d660e7 Respect the encoder options for the header write. 
Fixes an issue where the encoder options were ignored in the
passthrough case, because the options were free'ed and not
re-initialized.
 2021-10-18 20:15:02 -07:00
Isaac Connor 9f023f7bdd
Merge pull request #3372 from SudoMike/writable_image_buffer_function 
Added non-const versions of Image::Buffer
 2021-10-17 19:11:39 -04:00
Isaac Connor 4af605e675
Merge pull request #3374 from makers-mark/master 
Fix typo
 2021-10-17 19:10:34 -04:00
Isaac Connor d1596dee02 Fix removing uneeded checked 2021-10-17 19:08:12 -04:00
makers-mark 276add8ee4
Fix typo 2021-10-17 16:03:52 -04:00
Isaac Connor e1d49ea172 fix index -> image_index 2021-10-17 15:13:34 -04:00
Isaac Connor 3f6d6fe7a0 Improve debug logging of packetqueue cleaning 2021-10-17 15:02:31 -04:00