bcdadc67bf
Merge branch 'storageareas' into zma_to_thread
2017-12-12 15:29:19 -05:00
2643ac9f97
fix a quoting problem that prevented saving config
2017-12-12 11:16:08 -05:00
011c7e1540
revert to /1000000 tb
2017-12-08 14:22:38 -05:00
90820ab92a
Merge branch 'storageareas' into zma_to_thread
2017-12-07 10:37:04 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
5deb69207b
Merge branch 'storageareas' into zma_to_thread
2017-12-04 22:11:46 -05:00
d741cc1a72
fix saving Groups
2017-12-04 22:02:56 -05:00
f8d3c07586
Add h264 event view functionality and new feature alarmCues ( #2012 )
...
* Fix nearEventsQuery
Removed dbEscape from getNearEvents previous event because it only returns 0. Now matches next. Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch. Also added start times to allow for videoJS replaymode.
* Unescape filters
Filters need to be unescaped
* Add initial values to page load
* Add replay modes to videojs
* rough in figuring out a frame in between bulk frames
* Add alarmCues
Add a graphical indication of where alarm frames happened in an event. Similar to what zmNinja shows.
* Add remaining buttons to videojs
Functionality for all buttons on videojs streams. FF/RW buttons show as active when they are active.
* Whitespace and fix Bulkframe calcs
* Fix zms events trying to generate with mp4 code
ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed
* ZMS scrub bar
Move zms scrub bar to bottom of image feed. Make it simpler and more like videojs style.
* Wrap event feeds properly
* Fix dvrControls on watch view
* Add scaleToFit
Add a scaleToFit option to event view
* Add navigation for videoJS streams
Disables nav buttons at beginning and end of events. Handles switching from zms to videojs. If zms crashes changes next event function to reload page instead of ajax.
* Add scaleToFit to watch and frame view
Adds scaleToFit to watch view. Since frame view uses the watch cookie this required changes to frame view
* Add transition to zoom
* Change stills view to match stream
Move stills slider bar to match scrub bar on streams. Allow it to resize, make it larger. Add alarmcues.
* Add Stills for every event
Add stills for every event. Match size to stream size
* Progressbox transitions
2017-12-04 21:26:59 -05:00
fb952179cd
Fix delete filter ( #2010 )
...
Delete filter didn't work because the request does not include 'object'.
2017-12-04 21:26:21 -05:00
588f63b053
Merge branch 'storageareas' into zma_to_thread
2017-12-04 17:07:16 -05:00
0171d532fc
fix the test for DB_DEBUG
2017-12-04 16:50:56 -05:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
f2efc80f22
works?
2017-11-30 14:37:36 -05:00
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
81c46073a7
remove some brackets
2017-11-27 11:57:08 -05:00
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
dd3f9492ba
fix dulicate logic
2017-11-26 15:12:35 -05:00
b1bb0020d3
turn off database debug
2017-11-24 15:42:44 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
a9f0f3813a
Merge branch 'tesla' into storageareas
2017-11-24 09:31:00 -05:00
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
485567349d
Don't calc DiskSpace if it is already defined
2017-11-23 07:29:05 -08:00
2a669896c2
Merge branch 'tesla' into storageareas
2017-11-23 08:42:53 -05:00
8e494ef431
Merge branch 'storageareas' into zma_to_thread
2017-11-23 08:40:49 -05:00
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
095e1ecadb
remove extra ), add AnalysisFPS and CaptureFPS
2017-11-21 23:58:13 -05:00
e2aa278d78
add SaveJPEGs
2017-11-21 23:57:44 -05:00
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
c6515b7564
Merge branch 'storageareas' into zma_to_thread
2017-11-21 12:28:41 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
43b71fc49b
rework
2017-11-20 15:32:40 -05:00
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
d8af654338
Fix dvrControls on watch view
2017-11-18 14:05:11 -05:00
cca9fb13cc
add FPS to console
2017-11-14 15:33:31 -08:00
55eb78c951
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2017-11-14 13:17:55 -08:00
bb6e6c18eb
add defaults for CaptureFPS and AnalysisFPS
2017-11-14 13:17:50 -08:00
bac3fbfce9
fix compile on old ffmpeg
2017-11-14 08:55:00 -08:00
13ca8435ef
Don't go looking for Events to update Diskspace for
2017-11-14 08:13:54 -08:00
bafdf1fdfc
add codecs and containers
2017-11-13 21:41:57 -05:00
75743d63b6
fixes
2017-11-12 17:02:11 -05:00
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
5efaed0ef4
Merge branch 'storageareas' into ffmpeg_output
2017-11-08 17:22:07 -05:00
821717b06e
turn off debug
2017-11-08 11:26:13 -05:00
59a87c14d3
fix error message
2017-11-08 11:17:46 -05:00
625170bffc
fix getVideoStream to getVideoStreamHTML. Change how scaling works
2017-11-08 11:17:30 -05:00
bef7c0ed94
Only start a monitor if it has a Function
2017-11-05 11:54:00 -05:00
63c788ef0e
handle when sql error occurs and no params given
2017-11-03 15:45:11 -04:00
f39353a4a3
add missing breaks
2017-11-03 15:44:53 -04:00
0ef5c16bcc
when doing parseSort, reset the sortfield to StartTime instead of DateTime
2017-11-03 15:07:04 -04:00
67bb8c302f
add missing /
2017-11-03 10:00:29 -04:00
4ef28bb30d
don't put the leading / in the cache link
2017-11-03 09:22:43 -04:00
96e0959c35
clear the cookie for zmMontageLayout
2017-11-01 13:07:35 -04:00
0af389c984
populate the Id of the layout when inserting it
2017-11-01 13:07:24 -04:00
d4080dcdbd
when saving a new layout, auto-select it
2017-11-01 12:19:27 -04:00
a9d4dfac45
fix the file extension so that mime type works better
2017-11-01 11:52:32 -04:00
e6918cd1bd
implement crude cache busting code for .js and .css files
2017-11-01 09:41:19 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
ce6cc24de5
turn off debug
2017-10-30 20:20:40 -04:00
1694eeb436
debugging and code simplification
2017-10-30 16:29:27 -04:00
97757ba6cd
add Inserting when saving
2017-10-30 16:29:13 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
8312bf52a4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-30 08:37:54 -04:00
71222d7f2f
rework how montage layouts are done, pull from db now
2017-10-27 12:06:26 -07:00
71c8562b46
Rough in a MontageLayout class
2017-10-27 10:01:16 -07:00
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
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
0265a48a30
fix seg fault, fix pkt pts dts/duration. Stil wrong framerate
2017-10-26 10:12:56 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
b6dde354be
rename AnalysisFPS to AnalysisFPSLimit
2017-10-24 17:34:32 -07:00
b5e59efda5
improve updating diskSpace entries
2017-10-23 17:02:04 -07:00
d2c8a0240a
add a monitors view which is for editing function/enabled/server/storage of multiple monitors
2017-10-23 17:01:43 -07:00
ced5015a83
move zmcControl and zmaControl to the Monitor Object
2017-10-23 17:00:59 -07:00
df8fbaccea
Fixes
2017-10-23 11:50:45 -07:00
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
ed9da696b3
Rough in save functionality into Event.
2017-10-23 10:53:58 -07:00
6fba9fa65a
google code style and quotes
2017-10-20 14:54:28 -04:00
cf2eace2c7
improve htmlSelect and add Storage and Server filters to console
2017-10-19 09:50:07 -04:00
32ba53cf1b
turn off database debugging
2017-10-18 16:37:45 -04:00
ba4e5572d6
add setting of values to anonymouse member function
2017-10-17 10:09:14 -07:00
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
b96b2636bb
add the update to add Type to Storage
2017-10-12 07:50:43 -07:00
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
3f01f887aa
only count event size when s3
2017-10-11 14:10:53 -04:00
e845af94cc
include params when blowing up a dbQuery
2017-10-11 14:06:18 -04:00
a286b60150
use already loaded Storage object when lading events
2017-10-10 12:39:53 -07:00
67cb3a7d3c
better human_filesize function
2017-10-10 12:39:36 -07:00
aaffe475d8
turn off debug
2017-10-10 12:39:23 -07:00
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
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
ffc1ac43f5
put back disk space in header, more debug in caching storagea
2017-10-10 14:06:21 -04:00
a9d3be549f
try caching storage
2017-10-10 10:39:17 -07:00
76d37d4c95
update db record when we findout the disk space of an event
2017-10-10 13:02:26 -04:00
7f73f0bf8c
do a backtrace when we ca;; generateAuthHash without open session
2017-10-10 11:51:35 -04:00
d0f0ab1afe
refreshparent when saving group
2017-10-10 11:51:11 -04:00
3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
8da7d845b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-10 09:37:23 -04:00
Isaac Connor
Isaac Connor
digital-gnome
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor