Commit Graph

10236 Commits

Author SHA1 Message Date
Isaac Connor 311e62de7a change zmDbConnect to return a bool 2017-12-08 10:36:54 -05:00
Isaac Connor 4ab395b83a Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread 2017-12-07 10:52:16 -05:00
Isaac Connor 90820ab92a Merge branch 'storageareas' into zma_to_thread 2017-12-07 10:37:04 -05:00
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -05:00
Isaac Connor bbe75762e7 remove boost 2017-12-07 09:40:00 -05:00
Isaac Connor fb424a7eef add a robots.txt to the docroot to tell bots to not scrape our ZM install. 2017-12-07 09:32:23 -05:00
Isaac Connor 2a3683c072 add some more debug 2017-12-07 09:27:28 -05:00
kimmeld 1a5d9d5586 Fix monitor sorting (#2015)
Fixed issue #2014
2017-12-06 15:43:33 -05:00
Isaac Connor 9a7ee7a1e3 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-06 10:12:09 -08:00
Isaac Connor e7a43b2618 fix, don't set the storage path to NULL 2017-12-06 10:11:59 -08:00
Isaac Connor 933cdedaa6 Merge branch 'storageareas' into zma_to_thread 2017-12-06 11:58:29 -05:00
Isaac Connor e3776fabbf Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2017-12-06 11:57:41 -05:00
Isaac Connor afdff762fc
Merge pull request #60 from digital-gnome/storageareas-fixmissing
Storageareas fixmissing
2017-12-06 11:06:55 -05:00
digital-gnome 43bba23735 Fix filteradd complaining 2017-12-06 10:36:37 -05:00
digital-gnome 11a5a47826 Fix missing popups and styles 2017-12-06 09:42:58 -05:00
Isaac Connor d4cf9ec66a
Merge pull request #59 from digital-gnome/storageareas-css
Storageareas css
2017-12-05 21:46:59 -05:00
digital-gnome b8660e95c9 Dark theme options menu fixes
Override bootstrap to match dark theme
2017-12-05 21:01:17 -05:00
digital-gnome f47f1a89ea Fix btn-primary css to match current themes 2017-12-05 21:01:16 -05:00
Isaac Connor a64e556047 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-05 15:23:37 -08:00
Isaac Connor e46f75c130 fix db update 2017-12-05 15:22:15 -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
APHW2 MFGENG 0cfc42b9fd some cleanups/fixes 2017-12-05 13:16:52 -08:00
Isaac Connor 6b2eb89a61
Merge pull request #58 from digital-gnome/storageareas-view-button
Storageareas view button & popups
2017-12-05 14:39:03 -05:00
digital-gnome 6edb0247ef Fix popup detection 2017-12-05 13:27:39 -05:00
Isaac Connor 073b055b4c fix Event Moving 2017-12-05 10:21:43 -08:00
Isaac Connor b1a887dbd8 fixes to move Event 2017-12-05 10:02:21 -08:00
digital-gnome 37cdcb89c4 Fix view button in events view 2017-12-05 12:50:49 -05:00
Isaac Connor 82bed8f3fa actually delete the old files when we move an event 2017-12-05 08:43:13 -08: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
Isaac Connor 2cf5b2f60d
Merge pull request #57 from digital-gnome/storageareas-popupfixes
Handle popups that remain popups
2017-12-05 10:28:57 -05:00
digital-gnome 34b708bace Handle popups that should remain popups 2017-12-05 09:40:03 -05:00
Isaac Connor 004a41b122 remove boost dependency. 2017-12-04 22:59:50 -05:00
Isaac Connor 5deb69207b Merge branch 'storageareas' into zma_to_thread 2017-12-04 22:11:46 -05:00
Isaac Connor d741cc1a72 fix saving Groups 2017-12-04 22:02:56 -05:00
Isaac Connor f7a2db4e49 remove MaxScore from the sorting because it really doesn't make sense to sort by time then maxscore... time is going to be pretty much unique 2017-12-04 21:50:29 -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
digital-gnome 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
digital-gnome 03ad4898d9 Fix montage monitors jumping on alert (#2013)
The alert class from bootstrap was not overriden on monitors in montage.
2017-12-04 21:25:56 -05:00
Isaac Connor f3d3357365 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-12-04 20:52:43 -05:00
Isaac Connor 13de2b60d4 need to store the monitor object 2017-12-04 18:06:53 -05:00
Isaac Connor 61dd84de82 move most of the codec init out of the constructor into open so that we can fail gracefully 2017-12-04 18:06:42 -05:00
Isaac Connor a27374b827 Merge branch 'storageareas' into zma_to_thread 2017-12-04 17:11:46 -05:00
Isaac Connor 6f1e5fcc3b Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-04 17:11:28 -05:00
Isaac Connor 4f40b0464c Don't remove MonitorIds column.. just to support downgrading 2017-12-04 17:11:16 -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 588f63b053 Merge branch 'storageareas' into zma_to_thread 2017-12-04 17:07:16 -05:00
digital-gnome c72b1f3acf Fix refreshParent on some popups
Some popups wouldn't refresh the parent because after submit the none view page does not include jquery.  This angers javascript and prevents the close function from working.  Only fire header refresh code if there is a view.
2017-12-04 17:04:53 -05:00