Isaac Connor
|
bafdf1fdfc
|
add codecs and containers
|
2017-11-13 21:41:57 -05:00 |
Isaac Connor
|
75743d63b6
|
fixes
|
2017-11-12 17:02:11 -05:00 |
Isaac Connor
|
57a53f6fdd
|
spacing and fixes
|
2017-11-09 15:03:23 -05:00 |
Isaac Connor
|
5efaed0ef4
|
Merge branch 'storageareas' into ffmpeg_output
|
2017-11-08 17:22:07 -05:00 |
Isaac Connor
|
821717b06e
|
turn off debug
|
2017-11-08 11:26:13 -05:00 |
Isaac Connor
|
59a87c14d3
|
fix error message
|
2017-11-08 11:17:46 -05:00 |
Isaac Connor
|
625170bffc
|
fix getVideoStream to getVideoStreamHTML. Change how scaling works
|
2017-11-08 11:17:30 -05:00 |
Isaac Connor
|
bef7c0ed94
|
Only start a monitor if it has a Function
|
2017-11-05 11:54:00 -05: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
|
0ef5c16bcc
|
when doing parseSort, reset the sortfield to StartTime instead of DateTime
|
2017-11-03 15:07:04 -04:00 |
Isaac Connor
|
67bb8c302f
|
add missing /
|
2017-11-03 10:00:29 -04:00 |
Isaac Connor
|
4ef28bb30d
|
don't put the leading / in the cache link
|
2017-11-03 09:22:43 -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
|
a9d4dfac45
|
fix the file extension so that mime type works better
|
2017-11-01 11:52:32 -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
|
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
|
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
|
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
|
0265a48a30
|
fix seg fault, fix pkt pts dts/duration. Stil wrong framerate
|
2017-10-26 10:12:56 -07:00 |
Isaac Connor
|
653d213d62
|
Add EndTime and DiskSpace to Filters
|
2017-10-25 11:11:19 -07:00 |
Isaac Connor
|
b6dde354be
|
rename AnalysisFPS to AnalysisFPSLimit
|
2017-10-24 17:34:32 -07:00 |
Isaac Connor
|
b5e59efda5
|
improve updating diskSpace entries
|
2017-10-23 17:02:04 -07:00 |
Isaac Connor
|
d2c8a0240a
|
add a monitors view which is for editing function/enabled/server/storage of multiple monitors
|
2017-10-23 17:01:43 -07:00 |
Isaac Connor
|
ced5015a83
|
move zmcControl and zmaControl to the Monitor Object
|
2017-10-23 17:00:59 -07:00 |
Isaac Connor
|
df8fbaccea
|
Fixes
|
2017-10-23 11:50:45 -07:00 |
Isaac Connor
|
f99e404730
|
update the total_disk_space function to do and sql sum on the events that already have a space assigned and only update ones that don't. This reduces ram requirements.
|
2017-10-23 11:02:36 -07:00 |
Isaac Connor
|
ed9da696b3
|
Rough in save functionality into Event.
|
2017-10-23 10:53:58 -07:00 |
Isaac Connor
|
6fba9fa65a
|
google code style and quotes
|
2017-10-20 14:54:28 -04:00 |
Isaac Connor
|
cf2eace2c7
|
improve htmlSelect and add Storage and Server filters to console
|
2017-10-19 09:50:07 -04:00 |
Isaac Connor
|
32ba53cf1b
|
turn off database debugging
|
2017-10-18 16:37:45 -04:00 |
Isaac Connor
|
ba4e5572d6
|
add setting of values to anonymouse member function
|
2017-10-17 10:09:14 -07:00 |
Isaac Connor
|
6bf9e28a1e
|
fix use of api when auth not in use and actually specify which monitor to restart
|
2017-10-16 10:00:41 -07:00 |
Isaac Connor
|
b96b2636bb
|
add the update to add Type to Storage
|
2017-10-12 07:50:43 -07:00 |
Isaac Connor
|
8abb8a9259
|
add Type to Storage
|
2017-10-12 07:32:48 -07:00 |
Isaac Connor
|
3f01f887aa
|
only count event size when s3
|
2017-10-11 14:10:53 -04:00 |
Isaac Connor
|
e845af94cc
|
include params when blowing up a dbQuery
|
2017-10-11 14:06:18 -04:00 |
Isaac Connor
|
a286b60150
|
use already loaded Storage object when lading events
|
2017-10-10 12:39:53 -07:00 |
Isaac Connor
|
67cb3a7d3c
|
better human_filesize function
|
2017-10-10 12:39:36 -07:00 |
Isaac Connor
|
aaffe475d8
|
turn off debug
|
2017-10-10 12:39:23 -07:00 |
Isaac Connor
|
26699953bb
|
allow setting Storage object in the Event object so as not to go back to db for it. Fix null test in DiskSpace
|
2017-10-10 12:39:14 -07:00 |