APHW2 MFGENG
|
c2fab6e959
|
add the options for nvsocket as an include
|
2017-11-06 07:31:08 -08:00 |
Isaac Connor
|
bef7c0ed94
|
Only start a monitor if it has a Function
|
2017-11-05 11:54:00 -05:00 |
|
Isaac Connor
|
7374ced076
|
0 is a prefectly valid PreEventCount
|
2017-11-05 10:00:24 -05:00 |
|
Isaac Connor
|
09f3355e18
|
add /usr/share/zoneminder/www/cache as a temp dir
|
2017-11-04 14:52:36 -04:00 |
|
Isaac Connor
|
63c788ef0e
|
handle when sql error occurs and no params given
|
2017-11-03 15:45:11 -04:00 |
|
Isaac Connor
|
f39353a4a3
|
add missing breaks
|
2017-11-03 15:44:53 -04:00 |
|
Isaac Connor
|
8432ab5938
|
change quotes, and limit the # of results to 2 when getting next and previous frames. 2 is because one of them could be the currently selected Event,
|
2017-11-03 15:09:19 -04:00 |
|
Isaac Connor
|
0ef5c16bcc
|
when doing parseSort, reset the sortfield to StartTime instead of DateTime
|
2017-11-03 15:07:04 -04:00 |
|
Isaac Connor
|
cab8c4cd5e
|
cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style
|
2017-11-03 13:49:42 -04:00 |
|
Isaac Connor
|
54d77519c0
|
Only show Storage and Server filters if there is more than 1
|
2017-11-03 12:03:01 -04:00 |
|
Isaac Connor
|
67bb8c302f
|
add missing /
|
2017-11-03 10:00:29 -04:00 |
|
Isaac Connor
|
09938ef7ee
|
join the echo's into 1 to also get the line breaks
|
2017-11-03 09:24:13 -04:00 |
|
Isaac Connor
|
073c06f6a8
|
fix sizing after switching scale. basically re-apply the layout
|
2017-11-03 09:23:50 -04:00 |
|
Isaac Connor
|
4ef28bb30d
|
don't put the leading / in the cache link
|
2017-11-03 09:22:43 -04:00 |
|
Isaac Connor
|
5aa61cf1f5
|
unset the ref so that last monitor isn't duplicated
|
2017-11-02 07:59:25 -04:00 |
Isaac Connor
|
866c875312
|
Merge branch 'storageareas' into tesla
|
2017-11-01 12:01:51 -07:00 |
|
Isaac Connor
|
1aea1517bf
|
put back old behaviour for add monitor
|
2017-11-01 13:09:14 -04:00 |
|
Isaac Connor
|
eb2ee76f57
|
disable and re-enabled onclick action when editing layout/cancelling edit
|
2017-11-01 13:08:01 -04:00 |
|
Isaac Connor
|
96e0959c35
|
clear the cookie for zmMontageLayout
|
2017-11-01 13:07:35 -04:00 |
|
Isaac Connor
|
0af389c984
|
populate the Id of the layout when inserting it
|
2017-11-01 13:07:24 -04:00 |
|
Isaac Connor
|
d4080dcdbd
|
when saving a new layout, auto-select it
|
2017-11-01 12:19:27 -04:00 |
|
Isaac Connor
|
8e010b3bd0
|
get rid of experimental code to fix monitor layout. Apparently draggable does it all for us.
|
2017-11-01 12:00:48 -04:00 |
|
Isaac Connor
|
445fbb06d6
|
clearFix so that #monitors actually has a height
|
2017-11-01 11:52:59 -04:00 |
|
Isaac Connor
|
a9d4dfac45
|
fix the file extension so that mime type works better
|
2017-11-01 11:52:32 -04:00 |
|
Isaac Connor
|
36e13039c7
|
Switch to LONGTEXT FROM JSON type
|
2017-11-01 11:05:21 -04:00 |
|
Isaac Connor
|
25210b7ecf
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-11-01 09:41:22 -04:00 |
|
Isaac Connor
|
e6918cd1bd
|
implement crude cache busting code for .js and .css files
|
2017-11-01 09:41:19 -04:00 |
|
Isaac Connor
|
33771f92e9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-10-31 13:32:47 -07:00 |
|
Isaac Connor
|
9473fbecd8
|
more debug
|
2017-10-31 13:32:42 -07:00 |
|
Isaac Connor
|
3deb8a35bb
|
fixes
|
2017-10-30 21:38:27 -04:00 |
Isaac Connor
|
b5491102ef
|
Fix saving MontageLayouts
|
2017-10-30 20:21:16 -04:00 |
|
Isaac Connor
|
ce6cc24de5
|
turn off debug
|
2017-10-30 20:20:40 -04:00 |
|
Isaac Connor
|
52110adfa9
|
update code because we are now including the entire object in the layouts array
|
2017-10-30 16:32:14 -04:00 |
|
Isaac Connor
|
efe8b2db7e
|
update code because we are now including the entire object in the layouts array
|
2017-10-30 16:32:03 -04:00 |
|
Isaac Connor
|
c69e2468b0
|
add edit and save layout
|
2017-10-30 16:30:15 -04:00 |
|
Isaac Connor
|
207b66c8fa
|
add Edit Layout
|
2017-10-30 16:29:46 -04:00 |
|
Isaac Connor
|
1694eeb436
|
debugging and code simplification
|
2017-10-30 16:29:27 -04:00 |
|
Isaac Connor
|
97757ba6cd
|
add Inserting when saving
|
2017-10-30 16:29:13 -04:00 |
|
Isaac Connor
|
a6c790b374
|
use a shared include for the filters bar
|
2017-10-30 07:37:08 -07:00 |
|
Isaac Connor
|
8312bf52a4
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-10-30 08:37:54 -04:00 |
|
Isaac Connor
|
c16e101120
|
rough in add monitors import wizard
|
2017-10-27 20:52:08 -07:00 |
|
Isaac Connor
|
eb48759ff8
|
wip
|
2017-10-27 13:37:51 -07:00 |
|
Isaac Connor
|
71222d7f2f
|
rework how montage layouts are done, pull from db now
|
2017-10-27 12:06:26 -07:00 |
|
Isaac Connor
|
71c8562b46
|
Rough in a MontageLayout class
|
2017-10-27 10:01:16 -07:00 |
|
Isaac Connor
|
82fbec697f
|
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
|
2017-10-27 08:37:53 -07:00 |
|
Isaac Connor
|
bc150574c7
|
wip import
|
2017-10-26 18:56:10 -07:00 |
|
Isaac Connor
|
12b611b9d5
|
When in live mode say Camera Offline instead of no data
|
2017-10-25 13:02:28 -07:00 |
|
Isaac Connor
|
653d213d62
|
Add EndTime and DiskSpace to Filters
|
2017-10-25 11:11:19 -07:00 |
|
Isaac Connor
|
ea84bd1e69
|
add a Status Filter
|
2017-10-25 09:04:54 -07:00 |
|
Isaac Connor
|
b6dde354be
|
rename AnalysisFPS to AnalysisFPSLimit
|
2017-10-24 17:34:32 -07:00 |