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

12073 Commits

Author SHA1 Message Date
Isaac Connor c8b10b2e3b factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason. 2018-09-19 19:50:26 -04:00
Andrew Bauer 284d622464 update the way we access mapped mem in zm-alarm.pl 2018-09-19 12:06:09 -05:00
Isaac Connor ef347f6ba3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-19 12:05:40 -04:00
Isaac Connor 3a9f96e8e8 Skip deleting event if event is archived. And event not having a scheme is now an error 2018-09-19 12:03:51 -04:00
Isaac Connor 8a5c989cac fix warning when editing users after a monitor has been deleted 2018-09-18 08:52:43 -04:00
Isaac Connor 7f98277571 Merge updated Monitor.php that does caching 2018-09-15 09:52:08 -04:00
Isaac Connor b0c555599c Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209 2018-09-15 09:42:59 -04:00
Isaac Connor fa55cec12c fix error when scale is auto 2018-09-14 16:57:28 -04:00
Isaac Connor f1442eba90 once we have found a match for our origin, break out of loop 2018-09-14 14:56:26 -04:00
Isaac Connor d9b1d3ec11 fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port 2018-09-14 14:52:33 -04:00
Isaac Connor b5b71edbf6 Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80 2018-09-14 14:26:45 -04:00
Andrew Bauer 24ab10c07f
Merge pull request #2208 from pliablepixels/patch-3 
fixed path for login/logout api
 2018-09-14 10:50:59 -05:00
Pliable Pixels 0e2fdf4a1c
fixed path for login/logout api 2018-09-14 11:48:22 -04:00
Andrew Bauer c086cf2291
Merge pull request #2207 from connortechnology/fix_2205 
Fix #2205
 2018-09-14 10:30:28 -05:00
Isaac Connor f2a117c85b fix undefined $event 2018-09-14 11:06:08 -04:00
Isaac Connor 4528a043c5 fixtypo 2018-09-14 11:04:52 -04:00
Isaac Connor ca3fd5ddf8 get rid of deleteEventFiles function. People should use the object method 2018-09-14 10:08:35 -04:00
Isaac Connor 11137d271e Create utility functions in event for creating linkPath and idPath. Replace the code in Generate::createEventPath with using these nice new functions 2018-09-14 10:06:36 -04:00
Isaac Connor 63bed3af10 replace all uses of getEventPath with object function event->Path(). Remove getEventPath 2018-09-14 09:23:09 -04:00
Andrew Bauer 7ef9cf4231
typo 2018-09-13 20:13:06 -05:00
Isaac Connor 1e00034b4c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-13 16:19:47 -04:00
Isaac Connor 0ec391354c Merge branch 'fix_zms_from_mp4' into h265 2018-09-13 16:18:28 -04:00
Andrew Bauer 4b2d4d3871 fix rpm specfile changelog 2018-09-12 12:44:36 -05:00
Jonathan Lassoff 7bcf9d59e1 Use named regex capture groups. 2018-09-12 12:55:31 +00:00
Andrew Bauer 2f7c9a406a bump sql to 1.32.0 2018-09-12 07:27:45 -05:00
Andrew Bauer 002bb67ccc bump version to 1.32.0 release 2018-09-12 07:09:25 -05:00
Andrew Bauer 014202c41e bump rpm specfile to 1.32.0 2018-09-12 07:08:58 -05:00
Andrew Bauer b3565fb983 remove file that should not be there 2018-09-12 07:02:57 -05:00
Andrew Bauer c66dd25ebb implement collapsible headers (#2203) 2018-09-11 17:39:40 -04:00
Isaac Connor eef928a742 fix find_all => find 2018-09-11 14:31:03 -04:00
Isaac Connor 684f48979a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-11 14:30:19 -04:00
Isaac Connor f972df167b Merge branch 'master' into fix_zms_from_mp4 2018-09-11 13:22:42 -04:00
Isaac Connor 498435886f improve debug message 2018-09-11 13:22:35 -04:00
Isaac Connor b3ef347fd5 slight optimisations in frame skipping 2018-09-11 13:22:01 -04:00
Isaac Connor e98603885d Show # of frames, not the # of frames decoded already 2018-09-11 13:21:42 -04:00
Isaac Connor 0efc45fa93 implement a getFrame function that takes a timestamp and will seek to the appropriate time in the mp4 before getting a frame 2018-09-11 13:21:12 -04:00
Isaac Connor ec6317bd66 change how frame data is stored to be more useful, pass frame time offset to getFrame to tell ffmpeg which frame to get 2018-09-11 13:20:41 -04:00
Isaac Connor cc417cf3e7 reverse order of tests to be more efficient 2018-09-11 13:19:33 -04:00
Isaac Connor b545528bb0 If DefaultVideo is set, use the passthrough mp4 instead of generating and mp4 from jpegs 2018-09-11 08:49:42 -04:00
Isaac Connor 6fcf65459f show video tag version if codec set to auto and DefaultVIdeo exists 2018-09-11 08:43:42 -04:00
Isaac Connor c70fb2f195 When signal loss occurs, trigger an event close so that the event stops because we are no longer writing to the mp4 2018-09-10 17:11:16 -04:00
Isaac Connor bf1fbd169c return uninformative debug statement 2018-09-10 15:12:19 -04:00
Isaac Connor 8608fc97be fix trms=>terms 2018-09-10 15:11:57 -04:00
Isaac Connor 0ee261fae3 get rid of code that hid the close/back button on events if there was no history. 2018-09-10 15:11:41 -04:00
Isaac Connor 93bec93d4a Fix DefaultCodec in monitor 2018-09-10 15:09:27 -04:00
Isaac Connor 884ba078c7 Store codec in session for monitor 2018-09-10 15:09:08 -04:00
Isaac Connor 03f769eacc Rough in codec specification for Events 2018-09-10 12:22:55 -04:00
Isaac Connor 042d4c3099 Default to auditing all Storage Areas. Add a Server flag to audit only areas on a specific server. 2018-09-09 18:32:00 -04:00
Isaac Connor 978e332e3a Merge branch 'master' into storageareas 2018-09-09 16:36:31 -04:00
Isaac Connor 534aebb21f When loading previous and subsequent log lines, merge the fields in the filters instead of replacing 2018-09-09 16:36:09 -04:00