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

19900 Commits

Author SHA1 Message Date
Isaac Connor 70f4a68269 bump version for use_Amcrest_API 2022-02-02 13:13:00 -05:00
Isaac Connor 1f9e654821 Default limit to 0 which means no limit 2022-02-02 12:28:58 -05:00
Isaac Connor faabbabfd5
Merge pull request #3415 from jp-bennett/master 
Adds Amcrest MD, makes libcurl a hard requirement, and removes a redundant JS define.
 2022-02-02 12:28:35 -05:00
Isaac Connor 3feb4fcc51
Merge branch 'master' into master 2022-02-02 12:28:17 -05:00
Isaac Connor 31eff49a46 Implement filter limits. Which go before pagination/advanced search limits 2022-02-02 10:49:05 -05:00
Isaac Connor 4874dedc1f Bump version of RtspServer used 2022-02-02 10:28:23 -05:00
Isaac Connor 5b10f6ace6
Merge pull request #3421 from JedMeister/patch-1 
Update MariaDB Bullseye info in docs
 2022-02-01 22:47:58 -05:00
Jeremy Davis 63b3042d37
fix typo 2022-02-02 14:18:26 +11:00
Jeremy Davis ad0a095886
Update MariaDB Bullseye info 
Specifically note that setting a root password is not required (or recommended; unix socket authentication is better than simple password auth).
 2022-02-02 11:35:36 +11:00
Isaac Connor 18532096c5 Need full commits to get # of commits since last version change 2022-02-01 16:10:46 -05:00
Isaac Connor 4949159b88 Rough in pcm alaw support. Untested. 2022-02-01 14:06:12 -05:00
Isaac Connor 80461cb135 add libcurl4 as a dependency as it was in build-depends. 2022-02-01 13:36:11 -05:00
Isaac Connor bc4884afe5 fix replacement on escape. For some reason needs double bacl slash 2022-02-01 10:07:04 -05:00
Isaac Connor 462ec45a07 Escape newlines in config values. 2022-02-01 09:46:37 -05:00
Isaac Connor 34d7f192b4 Remove field that ffmpeg 5.0 doesn't have. 2022-02-01 07:23:12 -05:00
Isaac Connor 0eb4d95d0e remove geolocation copies from config to javscript land. Now all of config is brought in my skin.js.php 2022-01-31 18:33:03 -05:00
Isaac Connor 6b8cc14723 Don't free image data if we added the packet to an event. The lock moves to the event so it's not safe 2022-01-31 12:07:09 -05:00
Isaac Connor b00ca5ce91 upload entire build dir as shell expansions don't seem to work 2022-01-31 11:47:42 -05:00
Isaac Connor 3a2484b874 Try a different ssh implementation 2022-01-31 11:19:36 -05:00
Isaac Connor 46ad8e74e6 Add publish 2022-01-31 11:01:51 -05:00
Isaac Connor 61028a3ae1 Remove travis badge, use Isaac's full name. Fixes #3417 2022-01-31 10:09:31 -05:00
Isaac Connor 51f6a53b6c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-01-28 15:38:32 -05:00
Isaac Connor e5792c21c9 Push locked packets into event packetqueue instead of unlcoked contents. Prevents freeing of data before writing to event, hence crashing. 2022-01-28 15:38:18 -05:00
Isaac Connor a91e7d96f8 Merge fix for VP8 2022-01-28 12:42:41 -05:00
Isaac Connor d567d8aafc Merge upstream patches to RTSPServer 2022-01-27 17:06:18 -05:00
Isaac Connor 8e62562afd Move onclick to the surrounding div instead of the img. Fixes clicking on montage 2022-01-26 21:39:29 -05:00
Isaac Connor fe8747e5e7 Make ONVIF inputs 100% 2022-01-26 11:45:07 -05:00
Isaac Connor 42e24614d6 Include filename in debugs when writing out jpegs 2022-01-26 11:45:07 -05:00
Isaac Connor 138bada095 Add libdatetime-perl. Some Control modules need it 2022-01-26 11:45:07 -05:00
Jonathan Bennett a2a2f1a781 Move variables out of the ifdef gsoap block, as they are used for Amcrest support, too 2022-01-25 22:46:09 -06:00
Jonathan Bennett 57a697093e Remove redundant JS define 2022-01-25 22:38:06 -06:00
Jonathan Bennett ec9403fb6f Adds Amcrest On-camera Motion Detection 2022-01-25 22:38:00 -06:00
Isaac Connor 961256d2e7 terminate when zm_terminate is set. Do a countdown instead of countup. Sleeo for 10000 microseconds instead of 100. This restores the old value 2022-01-25 16:24:21 -05:00
Isaac Connor 17e01cb58f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-01-25 16:23:02 -05:00
Isaac Connor 4d90a816f8 Put a lock around jpeg writing. libjpeg is not thread safe 2022-01-25 16:22:33 -05:00
Isaac Connor 38da3b4d52 add some brackets to make logic more clear 2022-01-25 14:28:26 -05:00
Isaac Connor c8c09e560f Fix mTerminate not being initialised. 2022-01-25 14:27:39 -05:00
Isaac Connor cf82d767de Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image. 2022-01-25 14:27:32 -05:00
Isaac Connor 26ae5052f4 Fix fail to get Sources in RTSP. the string msg although initially reserved to ZM_NETWORK_BUFSIZ, after use it's capacity is changed whatever it's contents are. So need to re-reserve. 2022-01-25 11:55:21 -05:00
Isaac Connor 3cc243b9a8 Don't freshing config when doing update. That is it's own command 2022-01-24 09:24:16 -05:00
Isaac Connor 146ea4822d Bump the db queue limit to 30 before we warn. I only have 1 server that gets over 20 and it is still ok. 2022-01-24 09:24:16 -05:00
Isaac Connor f10d0fd3f5
Merge pull request #3413 from jp-bennett/master 
Adds janus updates
 2022-01-23 12:35:42 -05:00
Jonathan Bennett 5485c04bc6 Rework of the Janus polling loop 2022-01-23 01:07:48 -06:00
Jonathan Bennett d110987935 Fix indentation for ESLint 2022-01-22 13:37:44 -06:00
Jonathan Bennett abbd27d1cb Remove hard-coded config Vars 2022-01-22 13:31:47 -06:00
Jonathan Bennett 07c5b23aa6 Adds Janus streaming checks to polling thread 2022-01-22 12:49:08 -06:00
Isaac Connor 9443aaa2d8 Do state changes when in RECORD mode as well as it doesn't do motion detection Fixes #3411 2022-01-22 13:33:39 -05:00
Jonathan Bennett 8125aa633b
Merge branch 'ZoneMinder:master' into master 2022-01-22 12:20:13 -06:00
Isaac Connor 90f75dae93 Make config entries const 2022-01-22 12:33:48 -05:00
Isaac Connor 47aa1d1913 Bump version to 1.37.10 2022-01-22 12:31:56 -05:00