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

20042 Commits

Author SHA1 Message Date
Isaac Connor 3c655807e8 Use new Event->Server function to return the correct (and matching url to zms) url to use for ajax status calls. Fixes errors in a multi-server environment. 2022-02-03 14:47:32 -05:00
Isaac Connor 7a95aa7210 Don't render cues if we don't have any. This occurs on initial load we call changeScale which would re-render the cues but the cur ajax hasn't completed yet, so this just avoids an error being logged 2022-02-03 14:46:39 -05:00
Isaac Connor 7515711eb8 Implement Server function which figures out which Server likely has the video. Use it to remove duplicate logic 2022-02-03 14:45:17 -05:00
Isaac Connor 524662e6c7 Merge branch 'master' into replace_function_concept 2022-02-03 12:41:46 -05:00
Isaac Connor caebef3103 Replace uses of Function 2022-02-03 12:38:26 -05:00
Isaac Connor f40279b745 Remove active, add capturing, analysing, recording 2022-02-03 12:38:09 -05:00
Isaac Connor f7099bc6cb Replace another use of Function 2022-02-03 12:37:51 -05:00
Isaac Connor da4c880233 0 out another used of y-image 2022-02-03 12:16:01 -05:00
Isaac Connor d24b419f0e Only create packages for master 2022-02-03 12:06:00 -05:00
Isaac Connor 02a2c783e4 Disable alleged y-channel image motion detection. Doesn't work. 2022-02-03 11:57:27 -05:00
Isaac Connor 67ac0fdffd Disable alleged y-channel image motion detection. Doesn't work. 2022-02-03 11:57:00 -05:00
Isaac Connor 838704e58e Add more stop_ tests so that when we are told to terminate, we actually do so. 2022-02-03 11:40:17 -05:00
Isaac Connor b05bc211f7 Apparently it is actually the Y channel that we want. 2022-02-03 10:50:40 -05:00
Isaac Connor 7e9c707f92 V plane is actually the 3rd array entry, not the 4th 2022-02-03 10:06:36 -05:00
Isaac Connor fd7f7f851a V plane is actually the 3rd array entry, not the 4th 2022-02-03 08:19:08 -05:00
Jonathan Bennett 89e1c5d53c Move Monitor::MonitorLink to dedicated file 2022-02-02 16:51:27 -06:00
Isaac Connor bd68b9e3af Not ready for OutputSource yet 2022-02-02 17:10:05 -05:00
Isaac Connor 10e39b3b13 :wqMerge branch 'master' into replace_function_concept 2022-02-02 17:08:01 -05:00
Isaac Connor a4c91e9a3c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-02-02 14:36:15 -05:00
Isaac Connor 339f102196 Implement reboot and ping methods for Trendnet PTZ Control 2022-02-02 14:36:11 -05:00
Isaac Connor 48fc99a0e3 Implement reboot and ping methods for Trendnet PTZ Control 2022-02-02 14:34:53 -05:00
Isaac Connor 606c47ba87 If possible, use the v-channel from the yuv420p image for motion detection instead of the rgba data. 2022-02-02 14:33:58 -05:00
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 1c1630e5b4 add require Filter and fix missing $ 2022-02-01 17:23:16 -05:00
Isaac Connor 4d87b49f07 Remove weird cutnpaste User modules stuff from top of Filter.pm 2022-02-01 17:22:56 -05:00
Isaac Connor e69095a9b4 Fix == to = 2022-02-01 17:22:23 -05:00
Isaac Connor 3d5767b326 Merge branch 'master' into multistream 2022-02-01 16:52:42 -05: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 ad32466aa4 Remove function, replacing with capturing, analysing, recording. Adjust formatting of list function 2022-01-31 18:17:31 -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