Commit Graph

14855 Commits

Author SHA1 Message Date
Pliable Pixels 9a31d545d4 replace GIF function with MP4 2020-03-14 08:08:52 -04:00
Pliable Pixels 30d45aee8f formatting/comment 2020-03-13 15:11:00 -04:00
Pliable Pixels dd76ee2c9f spacing 2020-03-13 15:01:19 -04:00
Pliable Pixels 6b61f4ac84 when an event is created, write video name if applicable so image.php can extract frames while recording is in progress 2020-03-13 14:47:22 -04:00
Pliable Pixels ff7defa84e re-enable fragmented mp4 recordings 2020-03-13 14:46:20 -04:00
Isaac Connor 11b1bf1100 undo random addition 2020-03-11 10:54:52 -04:00
Isaac Connor c90655d178 fix build on libavtools < 12 2020-03-11 10:54:35 -04:00
Isaac Connor 4c984c3617 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-03-10 18:47:33 -04:00
Isaac Connor 9a3127da06 Merge branch 'rate_dropdown' 2020-03-10 18:47:19 -04:00
Isaac Connor 59bd658a96 replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc. 2020-03-10 18:46:20 -04:00
Isaac Connor 84d719f2dd Merge branch 'release-1.34' into rate_dropdown 2020-03-10 16:06:11 -04:00
Isaac Connor 79f98c78cc
Merge pull request #2881 from pliablepixels/dev
Added options to render objdetect, objdetectanim and objdetectimage
2020-03-10 14:46:22 -04:00
Pliable Pixels 49f23cb35b Added options to render objdetect, objdetectanim and objdetectimage 2020-03-10 13:51:55 -04:00
Isaac Connor 0f741d0e1c
Merge pull request #2880 from pliablepixels/1.34-dev
Add ability for image.php to render gif images
2020-03-09 16:30:15 -04:00
Pliable Pixels 38b519c8a6 better error log 2020-03-09 15:58:57 -04:00
Pliable Pixels 6bc8012e04 add support to render gif image that may be created by object detection 2020-03-09 15:56:34 -04:00
Isaac Connor 561479dd93 Merge branch 'release-1.34' 2020-03-09 14:45:00 -04:00
Isaac Connor 5fe1452a1a
Merge pull request #2879 from pliablepixels/1.34-dev
return frame IDs of snapshot and alarm frames for a specific e…
2020-03-09 14:44:41 -04:00
Isaac Connor e8553babfa remove extra spaces, fix eslint 2020-03-09 14:43:54 -04:00
Isaac Connor 3d993eef80 Fix triggers code 2020-03-09 14:39:57 -04:00
Isaac Connor a0bd602339 Use === when testing for empty value and setting defaults 2020-03-09 14:39:22 -04:00
Isaac Connor d055d40bfb Merge branch 'release-1.34' 2020-03-09 13:15:16 -04:00
Isaac Connor ffed88454f Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877 2020-03-09 13:14:09 -04:00
Pliable Pixels a261efe0a7 return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0 2020-03-09 12:04:40 -04:00
Pliable Pixels 3611d147e6 fix score frameID to return ID not Score 2020-03-09 11:25:07 -04:00
Pliable Pixels c5e838fa33 return global frame IDs of snapshot and alarm frames for a specific event 2020-03-09 11:09:20 -04:00
Isaac Connor f056f787c5 Merge branch 'release-1.34' 2020-03-08 17:24:06 -04:00
Isaac Connor e56976c800 Triggers cannot be null, it is '' instead 2020-03-08 17:23:48 -04:00
Isaac Connor bb72e3000c Merge pull request #2867 from veprbl/pr/cmake_install_full
cmake: use CMAKE_INSTALL_FULL_
2020-03-06 15:05:50 -05:00
Isaac Connor b482993d33 Merge branch 'release-1.34' 2020-03-06 15:04:48 -05:00
Isaac Connor 6d787fd77e Bump version for 1.34.6 2020-03-06 14:52:38 -05:00
Isaac Connor 3a129a8818 Merge pull request #2874 from hax0kartik/2810-libjwt
Add libjwt and remove gnutls-openssl wrapper
2020-03-06 14:48:45 -05:00
Isaac Connor f0791c8118 silence warning when no language is set 2020-03-05 22:13:32 -05:00
Isaac Connor 8300b94382 bump version to 1.35.1 2020-03-05 15:50:02 -05:00
Isaac Connor 4c52df24d3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-03-05 15:48:53 -05:00
Isaac Connor f003daa791 Merge branch 'add_enabled_to_storage' 2020-03-05 15:48:43 -05:00
Isaac Connor 835966eb24
Merge pull request #2874 from hax0kartik/2810-libjwt
Add libjwt and remove gnutls-openssl wrapper
2020-03-05 15:30:27 -05:00
Isaac Connor d30480e31e add passive to addEventListener 2020-03-05 14:10:35 -05:00
hax0kartik a53f67cd31 Remove a extra file added by mistake 2020-03-05 09:53:07 -08:00
hax0kartik 15aec7b109 Add libjwt 2020-03-05 09:51:33 -08:00
hax0kartik 2091ad8c92 Add libjwt and remove gnutls-openssl wrapper 2020-03-05 09:29:27 -08:00
Isaac Connor af2b6c435e Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-03-04 14:18:59 -05:00
Isaac Connor 424677165f Use ppa:iconnor/zoneminder-master instead of ppa:iconnor/zoneminder 2020-03-04 14:18:50 -05:00
Isaac Connor b78acd7b95 google code style 2020-03-04 14:14:38 -05:00
Isaac Connor 6d4ed20745 Drop lock around openFile so that we don't hang 2020-03-04 14:14:28 -05:00
Isaac Connor 2882693791 If can't connect to db, bail instead of loading config 2020-03-04 14:13:44 -05:00
Isaac Connor 06f480acf8
Merge pull request #2872 from ZoneMinder/revert-2844-2810-libjwt
Revert "Add libjwt as a optional library"
2020-03-04 13:57:40 -05:00
Isaac Connor 444c6fd372
Revert "Add libjwt as a optional library" 2020-03-04 13:57:27 -05:00
Isaac Connor 641b191c34
Merge pull request #2867 from veprbl/pr/cmake_install_full
cmake: use CMAKE_INSTALL_FULL_
2020-03-04 12:00:11 -05:00
Isaac Connor 24f04b8551
Merge pull request #2871 from pliablepixels/1.34-dev
move the recommended install method before what is discouraged
2020-03-04 11:59:02 -05:00