Isaac Connor
f2efc80f22
works?
2017-11-30 14:37:36 -05:00
Isaac Connor
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
Isaac Connor
81c46073a7
remove some brackets
2017-11-27 11:57:08 -05:00
Isaac Connor
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
Isaac Connor
dd3f9492ba
fix dulicate logic
2017-11-26 15:12:35 -05:00
Isaac Connor
b1bb0020d3
turn off database debug
2017-11-24 15:42:44 -05:00
Isaac Connor
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
Isaac Connor
a9f0f3813a
Merge branch 'tesla' into storageareas
2017-11-24 09:31:00 -05:00
Isaac Connor
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
Isaac Connor
485567349d
Don't calc DiskSpace if it is already defined
2017-11-23 07:29:05 -08:00
Isaac Connor
2a669896c2
Merge branch 'tesla' into storageareas
2017-11-23 08:42:53 -05:00
Isaac Connor
8e494ef431
Merge branch 'storageareas' into zma_to_thread
2017-11-23 08:40:49 -05:00
Isaac Connor
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
Isaac Connor
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
Isaac Connor
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
Isaac Connor
095e1ecadb
remove extra ), add AnalysisFPS and CaptureFPS
2017-11-21 23:58:13 -05:00
Isaac Connor
e2aa278d78
add SaveJPEGs
2017-11-21 23:57:44 -05:00
Isaac Connor
e617ffca2d
can't use BASE_URL since it will be empty. Have to construct a full URL when using MIN_STREAMING_PORT
2017-11-21 21:00:27 -05:00
Isaac Connor
c6515b7564
Merge branch 'storageareas' into zma_to_thread
2017-11-21 12:28:41 -05:00
Isaac Connor
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
Isaac Connor
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
Isaac Connor
43b71fc49b
rework
2017-11-20 15:32:40 -05:00
digital-gnome
b655689f47
Fix cache_bust
...
Cache busting was preventing changing css due to leaving symlinks behind. Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
digital-gnome
d8af654338
Fix dvrControls on watch view
2017-11-18 14:05:11 -05:00
Isaac Connor
cca9fb13cc
add FPS to console
2017-11-14 15:33:31 -08:00
Isaac Connor
55eb78c951
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2017-11-14 13:17:55 -08:00
Isaac Connor
bb6e6c18eb
add defaults for CaptureFPS and AnalysisFPS
2017-11-14 13:17:50 -08:00
Isaac Connor
bac3fbfce9
fix compile on old ffmpeg
2017-11-14 08:55:00 -08:00
Isaac Connor
13ca8435ef
Don't go looking for Events to update Diskspace for
2017-11-14 08:13:54 -08:00
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