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

15699 Commits

Author SHA1 Message Date
Isaac Connor cb0e54d3be consider Monitor->Controllable as well in stopping zmtrack. Don't complain about ControlCommand being told to start/stop 2020-07-20 10:23:26 -04:00
Isaac Connor 5c844f9cae remove extra space 2020-07-20 10:22:40 -04:00
Isaac Connor 055559ede3
Merge pull request #2981 from vezza/patch-1 
Update it_it.php
 2020-07-19 17:53:36 -04:00
Isaac Connor 135bbb4190 remove unneeded config loading, just use defines. Spacing, remove commented out dead code 2020-07-19 17:51:28 -04:00
Isaac Connor 01892352da rename sseversion to sse_version 2020-07-19 17:50:47 -04:00
Andrea Vezzali 1becd21df0
Update it_it.php 
Italian translation updates
 2020-07-19 00:01:14 +02:00
Andrew Bauer 696aa3b261
update redhat readthedocs 2020-07-17 08:28:16 -05:00
Isaac Connor 6b39f59b3a use delete[] instead of delete. 2020-07-16 16:00:23 -04:00
Isaac Connor 2c056c188f Fix compile on old ffmpeg 2020-07-16 15:59:08 -04:00
Isaac Connor 4e2732e12d Priming capture logs should be debug not Info 2020-07-16 15:51:24 -04:00
Isaac Connor 9d6e0fc3af Merge pull request #2977 from roddone/fix_events_table_responsive 
make events table (events view) responsive
 2020-07-16 15:49:01 -04:00
Isaac Connor a7b76dfe41 Remove debug 2020-07-16 15:48:09 -04:00
Isaac Connor 0a6321ee56 Update linesize when using AssignDirect. Fixes #2979 2020-07-16 15:48:06 -04:00
Isaac Connor d849ee54a4 Update state to ALARM AFTER we have opened the event, so that we get the correct event Id. Fixes #2978 Fixes #2894 2020-07-16 15:47:01 -04:00
Isaac Connor a8e46feb12 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-16 15:42:56 -04:00
Isaac Connor 3658c3b589 Update state to ALARM AFTER we have opened the event, so that we get the correct event Id. Fixes #2978 Fixes #2894 2020-07-16 15:36:26 -04:00
Isaac Connor c2a025300f Remove debug 2020-07-16 15:34:29 -04:00
Isaac Connor 9e06385f26 Update linesize when using AssignDirect. Fixes #2979 2020-07-16 14:50:50 -04:00
Isaac Connor 855efd57fd
Merge pull request #2977 from roddone/fix_events_table_responsive 
make events table (events view) responsive
 2020-07-15 10:44:34 -04:00
Isaac Connor bd59fad2c4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-14 11:31:24 -04:00
Isaac Connor 5e4676c660 Add Debian buster instructions. Update other debian dists to reference 1.34. 2020-07-14 11:31:10 -04:00
Isaac Connor 9b05337e57 Priming capture logs should be debug level, especially if they ar egoing to log passwords 2020-07-13 15:03:04 -04:00
Isaac Connor 926c3b8d34 Isaac added these explicit zmc~_heartbeat and zma_heartbeat entries. 2020-07-13 14:53:03 -04:00
Isaac Connor dcd67a1acf Remove args with non-sensical values from cgi params as a micro-opt 2020-07-13 14:50:21 -04:00
Isaac Connor 016d5119a3 increase days limit on stalebot 2020-07-13 14:49:54 -04:00
Romain ODDONE 785ab58a80 make events table (events view) responsive 2020-07-13 11:33:26 +02:00
Isaac Connor a747cd70d4 Use /run/zm instead of /var/run/zm 2020-07-11 10:44:28 -04:00
Isaac Connor 973450425d Use /run/zm instead of /var/run/zm 2020-07-11 10:44:06 -04:00
Isaac Connor ba8ab85411
Merge pull request #2975 from LocutusOfBorg/master 
Quote some more MySQL8 Reserved keywords
 2020-07-11 10:39:13 -04:00
Joseph Yasi cc93d553d8 Quote some more MySQL8 Reserved keywords 
See:
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295/comments/1
https://github.com/ZoneMinder/zoneminder/issues/2659
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
 2020-07-10 23:11:59 +02:00
Isaac Connor b53b666442 Increase time limits on stalebot 2020-07-10 09:49:44 -04:00
Andrew Bauer cfd57a851f fix eslint 2020-07-08 20:53:12 -05:00
Isaac Connor cd707571e7 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-07-08 17:22:32 -04:00
Isaac Connor a469fdef9a include the non-existent path in the warning 2020-07-08 17:21:59 -04:00
Isaac Connor e5afc1a2db Cleanup code that sets digest credentials. Fixes #2972 2020-07-08 17:20:52 -04:00
Isaac Connor 880219bb0f Merge branch 'release-1.34' 2020-07-07 18:58:32 -04:00
Isaac Connor 6469300af5 fix some csp violations 
y
 2020-07-07 18:57:11 -04:00
Isaac Connor 9b447bde8e remove extra { 2020-07-07 18:56:51 -04:00
Isaac Connor 89f975e646 remove code to play a sound on alarm. Not going to support that when editing a zone. 2020-07-07 16:40:33 -04:00
Isaac Connor 33d4680f02 Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal. 2020-07-07 16:35:37 -04:00
Isaac Connor e675c8373e Merge branch 'release-1.34' 2020-07-07 16:15:56 -04:00
Isaac Connor 916d1ed59e Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-07-07 16:15:23 -04:00
Isaac Connor c79c65e72e spacing fixes 2020-07-07 16:14:57 -04:00
Isaac Connor af74ecac4c Pass along the image linesize to Image constructors so that Image knows about the requirement for it to be 32byte aligned. 2020-07-07 16:14:38 -04:00
Isaac Connor fd9272241a Introduce constructors that can be passed a linesize which is the # of bytes to use to store a line of image. This can be different from the image width * colours as it should be 32byte aligned for use with sws_scale. 2020-07-07 16:13:41 -04:00
Isaac Connor cae8978501 add an alignment variable to ffmpeg_camera to use wherever we want to tell ffmpeg about the buffer and linesize alignment. Figure out linesize in the constructor so that zm_monitor can pass the info along to zm_image. 2020-07-07 16:12:14 -04:00
Isaac Connor 209cbe1000 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-07 09:23:46 -04:00
Isaac Connor b0f87eabc2 comment out hexdump stuff to remove the dependency 2020-07-07 09:23:32 -04:00
Isaac Connor acf8a30434 Merge branch 'release-1.34' 2020-07-07 09:22:56 -04:00
Isaac Connor 533876f313 rewrite code to use fewer lines. No logic change. 2020-07-07 09:16:42 -04:00