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

13528 Commits

Author SHA1 Message Date
Isaac Connor e5ba108149 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2019-07-26 12:46:01 -04:00
Isaac Connor 8167ff2143 fix eslint 2019-07-26 12:28:02 -04:00
Isaac Connor 4b89ced889 Warn about waiting more than .5s instead of .1 2019-07-26 12:24:36 -04:00
Isaac Connor e5c194e9ee Fix return 403 status code 2019-07-26 12:22:04 -04:00
Isaac Connor 09934ed7f5 Fix sendTextFrame 2019-07-26 12:21:25 -04:00
Isaac Connor 3da12fd141 Add a bunch of debugging 2019-07-26 12:21:15 -04:00
Isaac Connor b5a35e57b5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-26 10:54:02 -04:00
Isaac Connor 0643108ba4 Use fputs instead of fprintf. Spacing and google code style changes 2019-07-26 10:53:48 -04:00
Isaac Connor 547e80b1a9
Fix download and export button from events list. Fixes #2668 (#2670) 2019-07-24 12:31:43 -04:00
Isaac Connor a6a2239e5b
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists (#2662) 2019-07-24 11:39:21 -04:00
Isaac Connor 49621bf652 Only parse Sql if there is a Query in the filter 2019-07-23 12:58:03 -04:00
Isaac Connor d3d0579454 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2019-07-23 10:14:34 -04:00
Isaac Connor df0aef89af gracefully handle when window[fnName] doesn't exist 2019-07-23 10:03:28 -04:00
Isaac Connor fe71a9abaa php_errormsg is deprecated 2019-07-19 16:32:40 -04:00
Isaac Connor 1e0c39c632 mostly spacing cleanups. Don't bother setting pkt_duration on resampled frame 2019-07-19 16:28:18 -04:00
Isaac Connor 9a31f8792c return proper error codes when failed auth or fail permissions 2019-07-19 13:55:35 -04:00
Isaac Connor f3166663a5 unref hw_device_ctx on Close. I think this should release all the other hwaccel related stuff 2019-07-19 12:51:31 -04:00
Isaac Connor fcee031785 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-17 21:10:46 -04:00
Isaac Connor 542d88b6a4 fix compile without HWCONTEXT 2019-07-17 21:10:24 -04:00
Pliable Pixels a9d01ba3d2 Alarm api (#2665) 
* fixed alarm api to use tokens if present

* clearer debug logs for tokens

* space
 2019-07-17 20:38:58 -04:00
Pliable Pixels 2b7610a5ac fixed ffmpeg log association to zm log levels (#2664) 2019-07-17 20:37:27 -04:00
Isaac Connor 75af397223 hwFrame isn't defined unless we have HWCONTEXT_H 2019-07-17 20:33:23 -04:00
Isaac Connor 34c141304d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-17 10:07:29 -04:00
Isaac Connor ef9fe2dbd6 Free up hwFrame, preventing memleak 2019-07-17 10:06:30 -04:00
Pliable Pixels 67168a2387 demote token log (#2663) 2019-07-12 14:31:39 -04:00
Isaac Connor 52e7cde66d If Email has EIMOD, not only attach the image if it exists, but replace %EIMOD% with the link to it 2019-07-11 19:04:51 -04:00
Isaac Connor 05be9008c7 use FFMPEGInit to initialise ffmpeg instead of doing it ourselves 2019-07-11 17:57:11 -04:00
Isaac Connor 13c91bdf60 Add pts adjustment to the delayed flushed encoder packets 2019-07-11 17:56:53 -04:00
Isaac Connor 288f2f3e8f Convert zm_dump_frame from a function to a define, this way we get line #'s from where we call zm_dump_frame instead of from the line in zm_ffmpeg where the function was. 2019-07-11 17:56:22 -04:00
Isaac Connor d244aadee6 Fix #2655 2019-07-08 14:27:49 -04:00
Isaac Connor df8c46f0f0 Fix #2657 2019-07-08 14:22:46 -04:00
Isaac Connor 5b896b5e5c Replace password('admin') with the resulting string because use of password is deprecated 2019-07-08 14:16:57 -04:00
Isaac Connor 3d2f806699 Merge branch 'master' of github.com:connortechnology/ZoneMinder 2019-07-08 12:59:00 -04:00
Isaac Connor da5e8d19b8 Fix #2656 2019-07-07 17:54:45 -04:00
Isaac Connor b84e3499f4 Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message 2019-07-07 17:25:49 -04:00
Isaac Connor 4b41655dc5 fix 2019-07-07 16:10:53 -04:00
Isaac Connor 3c1cd1e750 rename var from nevents to nFrames because that's what they are. Fix an error when page=0 2019-07-07 16:03:54 -04:00
Isaac Connor 4c306fb140 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-07 08:57:43 -04:00
Isaac Connor 94cc85aa36 Sorta fix pts on encoded audio packets. Sync is off, but at least it is close 2019-07-07 08:57:22 -04:00
Isaac Connor 0f35d86efb implement zm_send_frame which sends a frame and receives a packet 2019-07-07 08:56:39 -04:00
Andrew Bauer 255f606ebf
bump rpm specfile 2019-07-07 07:33:50 -05:00
Andrew Bauer 8c735856f8
bump version 
required by #2653
 2019-07-07 07:32:12 -05:00
bluikko aa817adbed Add primary keys to Logs and Stats tables (#2653) 
* Add primary keys to Logs and Stats tables

Adds an auto_increment int(10) Id as PRIMARY KEY to Logs and Stats tables.

Closes ZoneMinder#2550 and makes ZoneMinder compatible with Galera writeset replication for InnoDB (Galera Cluster, Percona XtraDB Cluster).

*  Do ALTER TABLE only if columns do not exist

*  Add forgotten prepare/execute
 2019-07-07 08:26:06 -04:00
Isaac Connor 256a0aa679 google code style 2019-07-04 09:04:43 -04:00
Isaac Connor 2470c09b20 Honour thumbnail width when bringing up frames popup for frames and alarm frames 2019-07-03 17:19:10 -04:00
Isaac Connor 726e5c6dd5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-03 09:50:49 -04:00
Isaac Connor a9579484b8 gracefully handle failure to config hw pix fmt and debug a bit more 2019-07-03 09:49:53 -04:00
Isaac Connor ef0f5212f2 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2019-07-02 12:40:29 -04:00
Isaac Connor 5ea5bd9bde Only do audio_first_pts if we have audio_in_stream 2019-07-02 12:26:33 -04:00
Isaac Connor a52b17ca01 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-02 11:58:32 -04:00