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

10993 Commits

Author SHA1 Message Date
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
Andrew Bauer 7fed5fd596
spelling 2018-02-27 19:46:44 -06:00
Andrew Bauer 35c63ac0bc
Update packpack.rst 2018-02-27 17:43:36 -06:00
Andrew Bauer 5ac003d448
Update packpack.rst 2018-02-27 17:39:58 -06:00
Isaac Connor c5eec7e2fd hide save button on successful form completion so we don't get a duplicate submit 2018-02-27 15:10:45 -08:00
Isaac Connor 83fad681b3 use button tags and hide the button content after click 2018-02-27 11:49:13 -08:00
Isaac Connor c50627fd88 GroupIds needs to be an array 2018-02-27 11:21:04 -08:00
Isaac Connor 0312dc3c2d Add Group saving to Monitor saving 2018-02-27 11:20:52 -08:00
Isaac Connor 67cc7dcf7c Add a GroupIds function to return the groups 2018-02-27 11:20:41 -08:00
Isaac Connor 6a6eb87686 fix defaults 2018-02-26 18:00:02 -08:00
Isaac Connor 793e87c26d Apply chosen style to group and linked monitors dropdown 2018-02-26 17:58:20 -08:00
Isaac Connor 735e36c2a8 split htmlSelect into htmlOptions 2018-02-26 17:08:30 -08:00
Isaac Connor 3586825c90 fix preevent_count==0 causing div/0 2018-02-26 17:08:05 -08:00
Isaac Connor 902f5f098a remove debug code 2018-02-26 16:10:27 -08:00
Isaac Connor 944298428a break out get_groups_dropdown to call a function called get_dropdown_options to populate thje options 2018-02-26 16:10:10 -08:00
Isaac Connor 92c34f6043 add Groups to monitor edit 2018-02-26 16:09:36 -08:00
Isaac Connor 9d1a8b1e18 Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10% 2018-02-26 10:39:45 -08:00