Isaac Connor
|
128c4c73e9
|
Add official sql for loading a Monitor
|
2018-03-03 13:29:39 -08:00 |
|
Isaac Connor
|
3fc7ebee6c
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-03 09:32:23 -08:00 |
|
Isaac Connor
|
2864876d28
|
fix spacing, add code comment
|
2018-03-03 09:25:04 -08: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 |
|
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
|
dc074bd2c0
|
fix path to triggers.sql
|
2018-02-28 07:18:38 -08: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 |
|
Isaac Connor
|
bfbefc4c32
|
Use our new Control object to do the saving instead of a generic function
|
2018-02-26 07:31:48 -08:00 |
|
Isaac Connor
|
c6f632325e
|
create an object for Controls entries, with appropriate defaults
|
2018-02-26 07:31:22 -08:00 |
|
Isaac Connor
|
464b588f08
|
add a case for toggle, which are booleans and default them to false
|
2018-02-26 07:29:49 -08:00 |
Isaac Connor
|
3aa31fd524
|
Merge branch 'master' into storageareas
|
2018-02-23 10:23:35 -05:00 |
|
Isaac Connor
|
a888dac834
|
source files in /etc/zm/conf.d as well
|
2018-02-23 09:30:47 -05:00 |
|
Isaac Connor
|
cece2f35f0
|
remove triggers from zm_create.sql.in as they are now contained in triggers.sql
|
2018-02-23 07:50:05 -05:00 |
|
Isaac Connor
|
0ffb13648c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-23 07:46:49 -05:00 |
|
Isaac Connor
|
0a6b463301
|
FIx MontageLayout=>MontageLayouts
|
2018-02-23 07:46:37 -05:00 |
|
Isaac Connor
|
834edafc63
|
install triggers as well
|
2018-02-23 07:46:24 -05:00 |
Isaac Connor
|
5b55bef721
|
Add support for h264_mmal
|
2018-02-22 18:33:11 -05:00 |
|
Isaac Connor
|
9480adcc31
|
include authentication info when building the link to mp4
|
2018-02-22 13:05:53 -05:00 |
|
Isaac Connor
|
3eaf95c607
|
handle Storage reload request
|
2018-02-21 14:09:51 -05:00 |
|
Isaac Connor
|
449ac87af1
|
force reload on Storage in Event object when moving
|
2018-02-21 14:09:12 -05:00 |
|
Isaac Connor
|
c5081d1e4e
|
drop session before executing filter
|
2018-02-21 13:54:06 -05:00 |
|
Isaac Connor
|
460b0b0ab9
|
add an example monit config
|
2018-02-21 13:12:25 -05:00 |
|
Isaac Connor
|
52bca9d3ae
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-20 22:48:45 -05:00 |