Commit Graph

1374 Commits

Author SHA1 Message Date
digital-gnome b6917d8b71 Fix initial time parsing 2017-12-16 09:08:50 -05:00
digital-gnome d7532b0340 Add dateTime picker to filter 2017-12-15 22:57:42 -05:00
digital-gnome eec174750e Default for conjunction 2017-12-15 09:06:40 -05:00
digital-gnome c0fcfe6eb6 Combine possible sort inputs to one in sortQuery, output limitQuery 2017-12-15 08:47:08 -05:00
digital-gnome ce0a8c4486 Add sort/limit to filter object on pageload 2017-12-15 08:47:07 -05:00
digital-gnome dee976cf1a parseRows just needs to recreate the php logic 2017-12-15 08:47:06 -05:00
digital-gnome 2cba20ab46 Make form validation not reload page 2017-12-15 08:47:05 -05:00
digital-gnome 2ddb380d0d Remove submitToFilter 2017-12-15 08:47:05 -05:00
digital-gnome db59f06520 Weekday needs to detect start or end as well 2017-12-15 08:47:04 -05:00
digital-gnome 86af2269b2 Move arrays out of ifs, pass to js 2017-12-15 08:47:03 -05:00
digital-gnome a2c785f7eb Move validateForm 2017-12-15 08:47:03 -05:00
digital-gnome 04efff699a Set url when adding terms
Saves changes if reloaded or using back button
2017-12-15 08:47:02 -05:00
digital-gnome c936e9e2a9 No longer need line 2017-12-15 08:47:00 -05:00
digital-gnome c1cf356974 Montagereview filter passing in wrong block 2017-12-15 08:47:00 -05:00
digital-gnome 51b4ddb0e4 Add js for filter handling 2017-12-15 08:46:59 -05:00
digital-gnome d5ec45eed7 Include all DateTime possibilities 2017-12-15 08:46:58 -05:00
digital-gnome d2b9614ce7 Change reset to not reload form 2017-12-15 08:46:57 -05:00
digital-gnome fe6a6bec7c Use disabled button rather than remove
Reduces page jumping
2017-12-15 08:46:57 -05:00
digital-gnome 8515e77d67 Add text type to text fields 2017-12-15 08:46:56 -05:00
digital-gnome 9eb03a881d Always have a full line on filter page.
This allows javascript to copy easily
2017-12-15 08:46:55 -05:00
digital-gnome ee5552d9f9 Redirect Events when post
Fixes broken back due to form resubmit
2017-12-13 22:25:28 -05:00
digital-gnome c87d170972 Pass montagereview filter 2017-12-13 22:25:28 -05:00
Isaac Connor 8909184e2c fix 2017-12-13 18:14:14 -05:00
Isaac Connor 046a0dd6e9 need a line break 2017-12-13 16:45:51 -05:00
Isaac Connor abad266c5b introduce chosen to use it to make the filtering dropdowns awesome 2017-12-13 16:15:03 -05:00
Isaac Connor 4a1a9c48d5
Merge pull request #66 from digital-gnome/storageareas-fixBack
Storageareas fix back Redux
2017-12-13 12:40:11 -05:00
digital-gnome 0743a283da Remove back/close if opened in new tab 2017-12-13 12:34:31 -05:00
Isaac Connor 27c9752f34
Merge pull request #65 from digital-gnome/storageareas-fixBack
Storageareas fix back and montagereview popup
2017-12-13 10:23:50 -05:00
digital-gnome 1f7a5f26ab Fix montagereview event popup 2017-12-13 10:22:15 -05:00
digital-gnome e0c2061954 Fix back if window is opened in new tab. 2017-12-13 10:20:02 -05:00
Isaac Connor 56ace524ff Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-12-12 11:16:26 -05:00
Isaac Connor 9bd12d5b9a set a type on the buttons 2017-12-12 11:15:53 -05:00
Isaac Connor 9fe7ba25e2 improve the download ui 2017-12-11 14:33:17 -08:00
Isaac Connor 5bd5f03611 redo buttons as button tags 2017-12-11 12:51:38 -05:00
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -05:00
kimmeld 1a5d9d5586 Fix monitor sorting (#2015)
Fixed issue #2014
2017-12-06 15:43:33 -05:00
Isaac Connor e7a43b2618 fix, don't set the storage path to NULL 2017-12-06 10:11:59 -08:00
Isaac Connor a64e556047 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-05 15:23:37 -08:00
Isaac Connor e0a18143ad include Group Id in list 2017-12-05 15:20:15 -08:00
Isaac Connor d621222ead fix assignment when should be test 2017-12-05 13:26:21 -08:00
digital-gnome 6edb0247ef Fix popup detection 2017-12-05 13:27:39 -05:00
digital-gnome 37cdcb89c4 Fix view button in events view 2017-12-05 12:50:49 -05:00
Isaac Connor 62cc095c98 always load the storageareas array 2017-12-05 08:31:17 -08:00
Isaac Connor 6454594633 fix popup detection and add disk usage and storage area to event. 2017-12-05 08:30:58 -08:00
digital-gnome 34b708bace Handle popups that should remain popups 2017-12-05 09:40:03 -05:00
Isaac Connor 26c9d1991c fix populating the monitors select 2017-12-04 21:49:34 -05:00
digital-gnome 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
Isaac Connor 72a50910e6
Merge pull request #56 from digital-gnome/storageareas-fixMontageReviewFilter
Montagereview filter respect groups setting
2017-12-04 17:08:51 -05:00
Isaac Connor 6270408c8f rework group MonitorIds and add GroupId filters to api 2017-12-04 15:52:16 -05:00
digital-gnome 3f62d1e24d Montagereview filter respect groups setting 2017-12-04 14:35:33 -05:00