ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • cd2c977ed8 Merge branch 'master' into replace_function_concept Isaac Connor 2022-02-16 14:25:38 -0500
  • c9de883a7c Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. Isaac Connor 2022-02-16 14:18:37 -0500
  • 67563737c3 Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. Isaac Connor 2022-02-16 14:16:46 -0500
  • 243c780a6a cleanup and add fallback to read/write if no sendfile support. Isaac Connor 2022-02-16 14:16:25 -0500
  • 2336926d90 Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. Use new reworked zm_sendfile and handle if not all bytes are sent. Fixes #3437. Isaac Connor 2022-02-16 14:16:01 -0500
  • f3d3cad419 Remove non-translations Isaac Connor 2022-02-16 09:59:39 -0500
  • 2d3f99eabb rework zm_sendfile to try again if not all bytes were sent. According to the docs, this is entirely possible. Isaac Connor 2022-02-16 09:59:23 -0500
  • 055414c778 DefaultCodec is for event view, not live Isaac Connor 2022-02-16 09:28:58 -0500
  • 93ab345a3a DefaultCodec is for event view, not live Isaac Connor 2022-02-16 09:28:21 -0500
  • 9d400b9f6c
         use rockylinux:8 container for ci workflow Andrew Bauer 2022-02-16 08:33:44 -0600
  • a2a4a8e74f
         include arp-scan polkit files in rpm Andrew Bauer 2022-02-16 08:22:37 -0600
  • 59d283095d
         bump rpm specfile rtsp commit Andrew Bauer 2022-02-16 07:54:01 -0600
  • efc1ec770c Debug the contents of REQUEST on every hit. Isaac Connor 2022-02-15 18:52:40 -0500
  • b67e7b8111 serialize form instead of just passing filter id because the modal can now handle unsaved filters Isaac Connor 2022-02-15 18:52:27 -0500
  • 8b14885541 Add handling of NOT IN and =\[\] and \!\[\] Isaac Connor 2022-02-15 18:51:54 -0500
  • 33f23cbd84 Sync up n_frames, frame_count, curr_frame_id on int instead of a mix of long int, int and unsigned long int Isaac Connor 2022-02-15 18:51:10 -0500
  • 2bc0ec269a Merge branch 'master' into replace_function_concept Isaac Connor 2022-02-15 17:02:03 -0500
  • 4f8aba0801 Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2022-02-15 10:41:51 -0500
  • 956579d557 handle snap->in_frame being null. Isaac Connor 2022-02-15 10:41:42 -0500
  • a149fa37fc Make filter debug modal work on non-saved filter Isaac Connor 2022-02-15 10:37:14 -0500
  • b2e0f805bd Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425 Isaac Connor 2022-02-15 10:29:58 -0500
  • 59039de985 Use =[] instead of IN as operator. Fixes #3432 Isaac Connor 2022-02-15 10:23:30 -0500
  • ecd27d033c
         Merge pull request #3435 from ZoneMinder/revert-3434-3432-fix-events-view-filter-monitorid Isaac Connor 2022-02-15 10:07:59 -0500
  • 554840d811
         Revert "Add SQL opTypes IN, NOT IN to filter view, #3432" Isaac Connor 2022-02-15 10:07:48 -0500
  • 03bc24362f
         Merge pull request #3434 from jjakob/3432-fix-events-view-filter-monitorid Isaac Connor 2022-02-15 10:05:57 -0500
  • 5fd5c7fdd1 Maybe fix build on freebsd by including unistd.h Isaac Connor 2022-02-15 10:04:31 -0500
  • 13f2076dc9 Add SQL opTypes IN, NOT IN to filter view, #3432 Jernej Jakob 2022-02-15 14:15:08 +0100
  • c8a2b6d679 Merge branch 'master' into replace_function_concept Isaac Connor 2022-02-14 12:03:25 -0500
  • b6d2d96d11 Remove offending extra comma Isaac Connor 2022-02-14 09:47:59 -0500
  • 91b536b868 Change the test for slow functions to mod4. The unrolled and SSE function work on 4 pixels at a time or 16 or 12 bytes depending on colours.This will improve cpu use on resolutions like 1280x800 Isaac Connor 2022-02-14 09:43:48 -0500
  • 485cc26065 Merge branch 'master' into replace_function_concept Isaac Connor 2022-02-12 22:17:47 -0500
  • f47aa98b43 html is not a global.. confusing yes. Isaac Connor 2022-02-12 22:17:03 -0500
  • e3631099f6 Rename v_image to y_image cuz that's what it is Isaac Connor 2022-02-12 22:14:51 -0500
  • 552974c5b7 Pass full packet to AddFrame so that we can also write other contents out Isaac Connor 2022-02-12 22:14:21 -0500
  • 0e2f2cf572 Merge branch 'timeline_multi_monitor' Isaac Connor 2022-02-11 18:08:41 -0500
  • 6e7e6d9e8e small code cleanup, add Warnings when using slow blend functions. Isaac Connor 2022-02-11 12:43:10 -0500
  • 94bc40a6cf Split the data by monitor and display a monitor image/info for each monitor. Isaac Connor 2020-01-05 17:33:36 -0500
  • 3250e0edfe simplify some code, pass around zm_event json objects instead of event_id. Each monitor has it's own image so when loading event data put it into a div/img referenced by monitor Id Isaac Connor 2020-01-05 17:32:27 -0500
  • 4cc82e24f3 convert some tags to classes instead of ids. Add margin: 0 auto so that monitor images are centered Isaac Connor 2020-01-05 17:30:51 -0500
  • cb80283398 Merge branch 'master' into timeline_multi_monitor update code to use jquery instead of mootools when only viewing 1 monitor, split view in half load first event image righ toff the bat Isaac Connor 2022-02-11 18:03:35 -0500
  • 514a64ad45 small code cleanup, add Warnings when using slow blend functions. Isaac Connor 2022-02-11 12:43:10 -0500
  • b700e7b5ce
         Merge pull request #3424 from r01k/master Isaac Connor 2022-02-10 21:39:50 -0500
  • 4507b06e29 libcurl4-gnutls-dev is actually a runtime dependency Isaac Connor 2022-02-10 11:57:57 -0500
  • bcd0b6430b Convert Fatal()s to Errors() which is really more appropriate anyways. Maybe Fixes #3426 Isaac Connor 2022-02-08 18:11:33 -0500
  • 687818e1ec Convert Fatal()s to Errors() which is really more appropriate anyways. Maybe Fixes #3426 Isaac Connor 2022-02-08 18:11:33 -0500
  • b866888062 Change title of settings button to give an indication WHY it isn't enabled Isaac Connor 2022-02-08 17:51:21 -0500
  • 3abacfa488 Change title of settings button to give an indication WHY it isn't enabled Isaac Connor 2022-02-08 17:51:21 -0500
  • 66336106ca When device isn't specified, pass nullptr. Currently zmc device probing is broken. This fixes it. Not needed for master. Isaac Connor 2022-02-08 17:43:26 -0500
  • 9fee64b62f detaint language file. Isaac Connor 2022-02-08 14:17:30 -0500
  • 2db781ed44 Test for valid language file when saving user. Isaac Connor 2022-02-08 14:16:50 -0500
  • 2396e98fb9 detaint language file. Isaac Connor 2022-02-08 14:17:30 -0500
  • 6268652520 Test for valid language file when saving user. Isaac Connor 2022-02-08 14:16:50 -0500
  • b10bb9d8b0 Use getBodyTopHTML so that we get error messages in UI Isaac Connor 2022-02-08 13:33:22 -0500
  • 2b0398b35a Change the error message banner to always take up space and be seen. Isaac Connor 2022-02-08 13:32:37 -0500
  • 5b9ccc6889 Implement a check on change of language. Make sure that the specified language file exists. Reports errors to UI Isaac Connor 2022-02-08 13:29:51 -0500
  • b1d235f991 Use getBodyTopHTML so that we get error messages in UI Isaac Connor 2022-02-08 13:33:22 -0500
  • d7a8947e05 Only include janus.js if needed Isaac Connor 2022-02-08 13:33:02 -0500
  • cc9306afe3 Change the error message banner to always take up space and be seen. Isaac Connor 2022-02-08 13:32:37 -0500
  • 8cdd96f286 Implement a check on change of language. Make sure that the specified language file exists. Reports errors to UI Isaac Connor 2022-02-08 13:29:51 -0500
  • 684078e72f re-enable y-channel motion detection Isaac Connor 2022-02-08 12:08:41 -0500
  • f66a463574 Merge branch 'master' into replace_function_concept Isaac Connor 2022-02-08 12:07:30 -0500
  • e7cd63a6ff replace Function with Recording, Analysing, Capturing Isaac Connor 2022-02-08 11:22:41 -0500
  • b005927ea3 debug when no data.frames Isaac Connor 2022-02-08 11:21:56 -0500
  • 390d77a924 Replace Function with Capturing Isaac Connor 2022-02-08 11:21:36 -0500
  • 01fad8a0dc Replace Function monitor filter with Capturing, Analysing, Recording filters. Isaac Connor 2022-02-08 11:21:16 -0500
  • dcf6e5da46 If there is an ajax error, and the error is unauthorized, then reload the page. Isaac Connor 2022-02-08 11:20:54 -0500
  • 38c9ac1521 Update state action, replacing Function with Recording, Analysing, Capturing. Redirect to console instead of switching view. Isaac Connor 2022-02-08 11:20:27 -0500
  • aad79d3407 Rename MonitorAnalysingOptions => AnalysingOptions as they will have to be prefixed with module name anyways. Isaac Connor 2022-02-08 11:19:36 -0500
  • 03f6637060 Only load janus.js if we are using it Isaac Connor 2022-02-08 11:03:25 -0500
  • a7dc9d4e36 Implement General::jsonLoad Isaac Connor 2022-02-08 10:14:00 -0500
  • 2768975f96 Only notify one. Anyone waiting is waiting on a lock and only 1 process can get that lock, so only one should try. Isaac Connor 2022-02-08 10:12:29 -0500
  • 8c13aa7d3a Cleanup LockedPacket, use RAII Isaac Connor 2022-02-08 10:10:00 -0500
  • 8e689340ce Don't need to check for end of queue as we already did that when adding packet to the queue Isaac Connor 2022-02-08 10:06:32 -0500
  • 2f5a403fc4 Handle when no swap is configured Isaac Connor 2022-02-08 10:04:19 -0500
  • fe01af6966 Don't need to test for end() because we added our packet to the queue and still have the lock Isaac Connor 2022-02-08 09:57:56 -0500
  • 33473eac6a Add arp-scan as a tool for getting list of devices on network. Add an interface specifier to monitor probe just like on onvif-probe. Rough in support for Hikvision cameras Isaac Connor 2022-02-07 12:33:53 -0500
  • 2c23e18ea0 Add system path for arp-scan Isaac Connor 2022-02-07 12:33:05 -0500
  • 2b468fa115 Add policykit rules for arp-scan Isaac Connor 2022-02-07 12:32:50 -0500
  • d056f15e54 Add arp-scan to executable for use in network probing for cameras. Isaac Connor 2022-02-07 12:32:16 -0500
  • 5078eecdfd Add in get_networks and get_subnets as utilities to parse devices and networks in preparation for scanning/probing Isaac Connor 2022-02-07 12:31:31 -0500
  • 69053424cd When adding a new monitor, ModelId and ManufacturerId are not defined, so handle that Isaac Connor 2022-02-06 19:06:35 -0500
  • 02d896abe2 Fixed in export.php "Class 'Filter' not found" and construction of SQL query with wrong syntax r01k 2022-02-04 22:19:15 -0500
  • ac909d404a Use the reported move with x=0 y=0 for autostop in addition to old stop movement code Isaac Connor 2022-02-03 18:19:01 -0500
  • 1982c21e1f
         Merge pull request #3423 from jp-bennett/master Isaac Connor 2022-02-03 17:53:31 -0500
  • b3092f2f59 Add special handling for skip_locked, as it is a checkbox. Don't update REQUEST['Id'] on execute so we can redirect to the original filter. Isaac Connor 2022-02-03 17:31:37 -0500
  • dde3884084 Moves Janus and Amcrest into their own nested classes Jonathan Bennett 2022-02-03 16:31:07 -0600
  • a6dc7ba0fc Add debugging, but commented out Isaac Connor 2022-02-03 17:30:38 -0500
  • ac39be33f5 Don't assume filename of mp4. We store it in the event record for a reason. Fixes #3422 Isaac Connor 2022-02-03 17:24:33 -0500
  • 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. Isaac Connor 2022-02-03 14:47:32 -0500
  • 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 Isaac Connor 2022-02-03 14:46:39 -0500
  • 7515711eb8 Implement Server function which figures out which Server likely has the video. Use it to remove duplicate logic Isaac Connor 2022-02-03 14:45:17 -0500
  • 524662e6c7 Merge branch 'master' into replace_function_concept Isaac Connor 2022-02-03 12:41:46 -0500
  • caebef3103 Replace uses of Function Isaac Connor 2022-02-03 12:38:26 -0500
  • f40279b745 Remove active, add capturing, analysing, recording Isaac Connor 2022-02-03 12:38:09 -0500
  • f7099bc6cb Replace another use of Function Isaac Connor 2022-02-03 12:37:51 -0500
  • da4c880233 0 out another used of y-image Isaac Connor 2022-02-03 12:16:01 -0500
  • d24b419f0e Only create packages for master Isaac Connor 2022-02-03 12:06:00 -0500
  • 02a2c783e4 Disable alleged y-channel image motion detection. Doesn't work. Isaac Connor 2022-02-03 11:57:27 -0500
  • 67ac0fdffd Disable alleged y-channel image motion detection. Doesn't work. Isaac Connor 2022-02-03 11:57:00 -0500
  • 838704e58e Add more stop_ tests so that when we are told to terminate, we actually do so. Isaac Connor 2022-02-03 10:07:21 -0500