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

10908 Commits

Author SHA1 Message Date
Andy Bauer d1f9fb9a37 Merge branch 'habibapp1365-patch-3' 2018-03-06 11:38:17 -06:00
Andy Bauer b41363fd60 Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3 2018-03-06 11:37:49 -06:00
Isaac Connor b4c13d56d6 Merge ../ZoneMinder.master into storageareas 2018-03-06 12:29:59 -05:00
habibapp1365 80116aa44c
Update video.php 2018-03-06 20:12:47 +03:30
habibapp1365 497114e8e1
Update video.php 2018-03-06 20:11:02 +03:30
habibapp1365 aa2134bde4
Update zm_create.sql.in 2018-03-06 19:59:06 +03:30
habibapp1365 8a6b57c1a0
Update video.php 2018-03-06 19:54:24 +03:30
habibapp1365 7a589398a7
Update video.php 2018-03-06 19:53:26 +03:30
habibapp1365 661827a7b4
Update video.php 2018-03-06 19:52:01 +03:30
habibapp1365 afff20a06b
Update video.php 2018-03-06 19:48:01 +03:30
habibapp1365 50a63c7899
Create DCS3415.pm 
D-Link DCS-3415 IP Control Protocol
 2018-03-06 11:31:39 +03:30
Matthew Trescott 7a9350c44f Quick fix for mistake 2018-03-05 20:24:40 -05:00
Matthew Trescott 6194977697 Revamp postinst to also support MariaDB and use systemd to check service status, not /etc/init.d. 2018-03-05 19:38:42 -05:00
Matthew Trescott 17c5028312 Don't install init.d script 
Despite not being specified in the --with parameter to dh, dh_installinit still seems to be run. Since most distros use systemd now, it seems like a bad idea to install services to /etc/init.d.
 2018-03-05 19:17:11 -05:00
Matthew Trescott c750db91b5 Make sure a2enmod is available before calling it in postinst 
The user may be using zm with e.g. nginx since apache is not a dependency.
 2018-03-05 19:11:53 -05:00
Matthew Trescott 49a2065f34 Allow packaging with libx264-152, allow packaging with MariaDB instead of MySQL 2018-03-05 19:06:38 -05:00
Matthew Trescott 3475bfb672 Fix compilation on Ubuntu 18.04 
I'm not entirely sure why this wasn't a problem with icconor's source package on launchpad. But, even unfamiliar as I am with CMake, it doesn't make sense to me to throw a fatal error by checking for a header that is already known to be unavailable.
 2018-03-05 18:46:52 -05:00
Matthew Trescott d13335358f Copy ubuntu1604 to ubuntu1804 2018-03-05 18:39:29 -05:00
Andrew Bauer 0422f93202
Merge pull request #2050 from Tim-Craig/groups_api 
Adding group handling in API
 2018-03-05 08:29:20 -06:00
Isaac Connor e82b45077b
Merge pull request #84 from SteveGilvarry/patch-1 
Make Back button work in Safari
 2018-03-05 05:01:34 -08:00
tim 0654c7e3b2 Adding group handling in API 2018-03-04 23:01:52 -08:00
Steve Gilvarry 1c740de5dc
Add Return False to Event Back 2018-03-04 13:37:30 +11:00
Steve Gilvarry db8ab28845
Add return false to window.history.back 
Adding this makes it work in Safari
 2018-03-04 08:37:21 +11:00
Isaac Connor 128c4c73e9 Add official sql for loading a Monitor 2018-03-03 13:29:39 -08:00
Andrew Bauer ed4dac761a
Merge pull request #2049 from ZoneMinder/fix_2044 
Fix 2044
 2018-03-03 12:49:57 -06:00
Andrew Bauer 029376f715
Merge pull request #2048 from Rorosha/1963-update-api-docs 
Issue 1963: Remove spaces from example api calls.
 2018-03-03 12:47:46 -06:00
Isaac Connor 3fc7ebee6c Merge ../ZoneMinder.master into storageareas 2018-03-03 09:32:23 -08:00
Isaac Connor 34dec24ebd Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-03-03 09:25:34 -08:00
Isaac Connor 2864876d28 fix spacing, add code comment 2018-03-03 09:25:04 -08:00
Mike R 3dc157732a Issue 1963: Remove spaces from example api calls. 2018-03-03 00:58:35 -05:00
Isaac Connor 47ec0abf11 spacing 2018-03-02 18:27:03 -08:00
Isaac Connor c53b6ffbb0 rework montagereview to load data faster and leave event and frame data in json objects 2018-03-02 18:26:50 -08:00
Isaac Connor 91c9714e43 cleanup 2018-03-02 18:26:21 -08:00
Isaac Connor d980def64f spacing, increase debug 2018-03-02 18:26:07 -08:00
Isaac Connor 77ded1f5be spacing and increase debug 2018-03-02 18:25:46 -08:00
Isaac Connor ede13ac41b put all db access after finishing encoding, because we don 
't care when they happen, and we need the encoding done.
 2018-03-02 18:25:20 -08:00
Isaac Connor a6827c97ab Cleanup, add some sanity checks 2018-03-02 18:24:39 -08:00
Andrew Bauer 3e77a85549
url to css/spinner.css should be relative 
fixes http 404 not found errors for this css file
 2018-03-02 17:19:10 -06:00
Isaac Connor cdbe66b4a3 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-03-01 19:24:03 -08:00
Isaac Connor 7e628bc3fd add showing groups under Monitor Name on console 2018-03-01 19:23:46 -08:00
Isaac Connor 9a157bf4ca add Type, MaxFPS, AlarmMaxFPS to field defaults 2018-03-01 19:23:27 -08:00
Isaac Connor debe4607bc add Parent and Parents functions 2018-03-01 19:23:03 -08:00
Isaac Connor 9af6dc02bc better debug of packet pts/dts/duration 2018-03-01 19:22:47 -08:00
Isaac Connor 28342b907b add a thread for deleting the event. This is because writing out the final frames of an mp4 can take a long time, during which we are not analyzing. 2018-03-01 19:22:22 -08:00
Isaac Connor 4d81b7b66b Do not just reconnect to the input stream on EOF. pts/dts gets outof whack when doing passthrough. Instead treat it as a loss of signal, which will end the event and start a new one 2018-03-01 19:21:41 -08:00
Isaac Connor 1bc6e40fbc add mutex locking around mysql functions so that we can go multi-threaded 2018-03-01 19:20:52 -08:00
Isaac Connor b3d23ab233 merge zma_to_thread version of db functions, which include a mutex lock 2018-03-01 19:20:29 -08:00
Isaac Connor 865649d785 Turn on c++11 2018-03-01 19:20:00 -08:00
Isaac Connor 0077f2e17b
Update faq.rst 
I see no reason to mention bits. No one cares about bits. Our base unit should be bytes.  Also, lets be consistent and use 1024 as the divisor when converting to Kb and Mb and Gb.
 2018-02-28 11:06:28 -05:00
Isaac Connor dc074bd2c0 fix path to triggers.sql 2018-02-28 07:18:38 -08:00