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

15618 Commits

Author SHA1 Message Date
Isaac Connor d5dbebefe5 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-07-21 19:06:38 -04:00
Isaac Connor c5285143f7 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2020-07-21 17:39:32 -04:00
Isaac Connor 13e8ed1924 Clean up code that updates event with video_name. Fix video_file assignment missing / 2020-07-21 16:34:46 -04:00
Isaac Connor f217ab54a3 When event_close_mode == CLOSE_ALARM and so we want to close the recording and start a new one, don't do it when alarm_frame_count > 1 until alarm_frames > alarm_frame_count. I believe this fixes a mem leak 2020-07-21 16:17:46 -04:00
Isaac Connor f593261136 Convert use of char path[PATH_MAX] to std::string. Fixes potential overflows, quiets compile, should reduce ram quite a bit and might event be faster. Code is also more readable. 2020-07-21 16:16:16 -04:00
Isaac Connor 2eec85eaff Convert use of char path[PATH_MAX] to std::string. Fixes potential overflows, quiets compile, should reduce ram quite a bit and might event be faster. Code is also more readable. 2020-07-21 16:10:05 -04:00
Isaac Connor 495cd56b8b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-21 14:39:51 -04:00
Isaac Connor 64e4363302 update code populating DeviceChannel, DeviceFormat, CapturePalette 2020-07-21 13:40:04 -04:00
Isaac Connor 785087022d Clear PerAlarmFrames on shutdown 2020-07-20 21:09:07 -04:00
Isaac Connor a0be7b1fcb fixup EmptyPreAlarmFrames 2020-07-20 21:02:49 -04:00
Isaac Connor 41dfb8ae38 fix duplicate jpeg_create_compress memleak 2020-07-20 21:02:06 -04:00
Isaac Connor a70b329ce3 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-07-20 18:40:59 -04:00
Isaac Connor e23c6de373 populate monitors with monitor array which will be json-encoded. Fixes failed population of monitor names dropdown 2020-07-20 17:42:25 -04:00
Isaac Connor 03195a8786 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-20 16:25:59 -04:00
Isaac Connor d716d1d686 Merge branch 'release-1.34' 2020-07-20 16:25:41 -04:00
Isaac Connor 4e2633d22b Update code to make calls to api on remote servers 2020-07-20 16:25:29 -04:00
Isaac Connor e839919b5e Add foreign key MonitorId validation 2020-07-20 16:25:08 -04:00
Isaac Connor 955fc00b87 Fix Zone add api. Restart zmc when adding a zone. Use validation. Fixes #2983 2020-07-20 16:24:49 -04:00
Isaac Connor bbee6b4f58 Whitespace, delete dead code 2020-07-20 16:23:55 -04:00
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