804339f54f
Limit date range and only reload page after change is done
2017-12-17 16:44:57 -05:00
5d190dedff
Set brackets width and allow blank
2017-12-17 14:25:50 -05:00
bb75e6a6ea
Disallow future dates
2017-12-17 14:24:58 -05:00
173ad4f75a
Add datepicker to montagereview
2017-12-17 09:22:31 -05:00
6ffa96dea3
Add chosen to filters
2017-12-16 23:10:20 -05:00
d7532b0340
Add dateTime picker to filter
2017-12-15 22:57:42 -05:00
eec174750e
Default for conjunction
2017-12-15 09:06:40 -05:00
dee976cf1a
parseRows just needs to recreate the php logic
2017-12-15 08:47:06 -05:00
2cba20ab46
Make form validation not reload page
2017-12-15 08:47:05 -05:00
2ddb380d0d
Remove submitToFilter
2017-12-15 08:47:05 -05:00
86af2269b2
Move arrays out of ifs, pass to js
2017-12-15 08:47:03 -05:00
a2c785f7eb
Move validateForm
2017-12-15 08:47:03 -05:00
04efff699a
Set url when adding terms
...
Saves changes if reloaded or using back button
2017-12-15 08:47:02 -05:00
51b4ddb0e4
Add js for filter handling
2017-12-15 08:46:59 -05:00
d2b9614ce7
Change reset to not reload form
2017-12-15 08:46:57 -05:00
046a0dd6e9
need a line break
2017-12-13 16:45:51 -05:00
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
0743a283da
Remove back/close if opened in new tab
2017-12-13 12:34:31 -05:00
1f7a5f26ab
Fix montagereview event popup
2017-12-13 10:22:15 -05:00
e0c2061954
Fix back if window is opened in new tab.
2017-12-13 10:20:02 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
1a5d9d5586
Fix monitor sorting ( #2015 )
...
Fixed issue #2014
2017-12-06 15:43:33 -05:00
37cdcb89c4
Fix view button in events view
2017-12-05 12:50:49 -05:00
34b708bace
Handle popups that should remain popups
2017-12-05 09:40:03 -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
3f62d1e24d
Montagereview filter respect groups setting
2017-12-04 14:35:33 -05:00
9ca19b003f
Add download button to montagereview
2017-12-03 14:42:09 -05:00
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
11629076f6
Fix Timeline view, add list link
2017-12-02 12:28:06 -05:00
58159963fa
Fix back on timeline view
2017-12-02 12:28:05 -05:00
e6568d01a3
Remove timeline popup
2017-12-02 12:28:05 -05:00
9d1bbfab42
Remove unused code from event
2017-12-02 12:28:05 -05:00
7a5dfb71dc
Remove no longer used max from events
2017-12-02 12:28:05 -05:00
1289269e6f
Change filter to work without popup
2017-12-02 12:28:04 -05:00
9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
...
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
e64497c16a
Merge pull request #54 from digital-gnome/storageareas-uifixes
...
Storageareas uifixes
2017-12-01 16:30:29 -05:00
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
18dc515ba4
stills view loads image when slider used
...
Stills view now loads the selected image if an image is being viewed and the slider is used.
2017-11-26 19:08:07 -05:00
136f0e90f5
Fix autoscale on stills view
...
Switching from stills view and changing the window would make stream view go crazy. Changed to autoscale on switch
2017-11-26 19:08:07 -05:00
b506466a70
Change alarmcues to accept arbitrary containing element
2017-11-26 19:08:07 -05:00
b5db885a31
Add scaleToFit to frame view
...
Changes navigation to use flexbox because absolute positioning was messing with scaletofit. Also makes frame view respect scale choice
2017-11-26 19:08:06 -05:00
55699a9b9b
Change scaleToFit to choose what to fit
...
Adds 4th input to choose what element is the last thing to fit.
2017-11-26 19:08:06 -05:00
68e54400e2
Add scaleToFit to watch view
2017-11-26 19:08:06 -05:00
3920420aa9
Convert scaleToFit to shared function
2017-11-26 19:08:06 -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
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
11449b77a9
add debugging. increase concurrency of request queue
2017-11-22 11:46:24 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
c7ecb71810
Fix progressbar on short events
...
Fixes rounding errors at the end of events due to zms only returning integers. Especially noticable on short events.
2017-11-17 22:29:10 -05:00
64346a031d
alarmCues to status.php
...
Switched alarm cues from API to ajax/status.php. Less overhead due to only requesting the information it needs and avoids a weird problem with authentication after sitting logged in for hours.
2017-11-16 21:03:03 -05:00
617a92e33e
Re-Add streamstatus pause
...
Handles when stream is paused from zms side.
2017-11-16 16:21:17 -05:00
a7b02ea3ba
Fix eventVideo and content div wrapping properly
...
Wrap eventVideo div around both videojs and zms. Consolidate control buttons/status to common set with default values.
2017-11-14 23:04:05 -05:00
ef6cb42c5f
Cleanup
2017-11-11 14:49:43 -05:00
1b8ae2bb45
Fix autoscale for ZMS
...
ZMS zoom would display broken jpegs with arbitrary scale. When using scaleToFit set zms scale to nearest regular scale and let the browser handle the rest.
2017-11-11 14:49:43 -05:00
44c8299faa
Consolidate initPage
2017-11-11 14:49:43 -05:00
91c3e3573c
ZMS controls for videojs
...
Add ZMS style controls to videojs page. Zoom, fast forward, fast reverse, frame skip, play/pause. Some cleanup of old videojs code
2017-11-11 14:49:43 -05:00
21949f5426
Cleanup vjsReplay
2017-11-11 14:49:43 -05:00
1b6992ea6b
Fix stills
...
Event stills fits on the page without a phantom scroll. Still image is scaled to fit the window instead of being full event size.
2017-11-11 14:49:43 -05:00
81a57b086e
Add stills window for everything
...
Stills can work for every event since frames can be generated after the fact by ffmpeg
2017-11-11 14:49:43 -05:00
5e9aacfc09
Stills path fix
2017-11-11 14:49:42 -05:00
1ae3fca599
Fast forward and rewind show active
...
FF and RW show as active if they are active
2017-11-11 14:49:42 -05:00
95622cc3b0
pause on delete
...
Pausing on delete lets a slow network user know that the click worked.
2017-11-11 14:49:42 -05:00
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
7374ced076
0 is a prefectly valid PreEventCount
2017-11-05 10:00:24 -05:00
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
073c06f6a8
fix sizing after switching scale. basically re-apply the layout
2017-11-03 09:23:50 -04:00
866c875312
Merge branch 'storageareas' into tesla
2017-11-01 12:01:51 -07:00
eb2ee76f57
disable and re-enabled onclick action when editing layout/cancelling edit
2017-11-01 13:08:01 -04:00
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
36e13039c7
Switch to LONGTEXT FROM JSON type
2017-11-01 11:05:21 -04:00
33771f92e9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-31 13:32:47 -07:00
9473fbecd8
more debug
2017-10-31 13:32:42 -07:00
3deb8a35bb
fixes
2017-10-30 21:38:27 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
52110adfa9
update code because we are now including the entire object in the layouts array
2017-10-30 16:32:14 -04:00
efe8b2db7e
update code because we are now including the entire object in the layouts array
2017-10-30 16:32:03 -04:00
c69e2468b0
add edit and save layout
2017-10-30 16:30:15 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
c16e101120
rough in add monitors import wizard
2017-10-27 20:52:08 -07:00
eb48759ff8
wip
2017-10-27 13:37:51 -07:00
71222d7f2f
rework how montage layouts are done, pull from db now
2017-10-27 12:06:26 -07:00
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
12b611b9d5
When in live mode say Camera Offline instead of no data
2017-10-25 13:02:28 -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
6b2d0aa59b
fix popup when clicking on a monitor on montagereview
2017-10-23 17:03:41 -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
df8fbaccea
Fixes
2017-10-23 11:50:45 -07:00
681abd64fc
Instead of No Data, make a more general function that will write any text without clearing the image behind it
2017-10-23 10:54:38 -07:00
1bddec1548
Bypass refreshParentWindow
...
This hasn't worked for a while. It looks like it's the result of a fix for filter window redirecting. It's possible other things use it but this fixes event deletion without touching anything else.
2017-10-22 17:23:04 -04:00
298085ae93
Fix archive nulling vid src
2017-10-22 15:02:36 -04:00
3fe46cbaff
Scale to Fit
...
Added a scale to fit option. When navigating between events of different size they will fill the window. Turned on when any event uses it, turned off when any event turns it off.
2017-10-22 12:13:16 -04:00
ecb980c66f
Navigation
...
Videojs navigation now uses ajax. Feels and is faster. Some improvements, namely if zms ever crashes we can still navigate. Both zms and videojs update the address bar so refreshing a page doesn't return you to the first event.
2017-10-21 22:14:46 -04:00
ff8d067639
alarmCues improvements
...
Consolidate selectors and improve edge cases where skew could cause overflow
2017-10-21 22:14:46 -04:00
1eb2edd95c
Converge initial eventData with ajax
...
The initial eventData object on page load didn't have most of the information that the ajax call gave it.
2017-10-21 22:14:46 -04:00
f2f2aa8720
Replay improvement and overlays
2017-10-21 22:14:46 -04:00
c6373d3dca
whitespace and jquery
2017-10-21 22:14:46 -04:00
digital-gnome
Isaac Connor
kimmeld
Isaac Connor
Isaac Connor
Isaac Connor