Commit Graph

367 Commits

Author SHA1 Message Date
digital-gnome 90d3067cab progressBar offset scope
fixes progressBar offset passing a reference instead of a copy by wrapping it in a function.  also fixes click events endlessly adding when navigating through zms events.
2017-10-11 21:07:45 -04:00
digital-gnome 1c744278e7 rescale fix
everything rescales except the buttons.
2017-10-11 21:05:39 -04:00
digital-gnome f702c841f5 navigation handling
Navigation can now handle going from videojs streams to zms.  It gracefully handles deleting the last event and running out of events.  zms limitations means we still can't see mp4 recordings before they are done but we don't get stuck on them anymore.
2017-10-11 21:04:45 -04:00
digital-gnome b9f9dd721b initialAlarmcues arguements
initialAlarmcues now takes an eventId arg.  Needed to reload when zms streams switch since they don't reload the page
2017-10-11 20:57:13 -04:00
digital-gnome 99dd469a1c alarmCues fixes
use evtStream for width.  progressBar isn't always fully loaded in time.  Combine skewNone and skewAlarm.  Does a more accurate job of keeping everything in line.
2017-10-11 20:49:52 -04:00
digital-gnome 067f8a8089 replayAll fixes
replayAll now handles end of events gracefully.  Fixed bug where back to back continuous events or events that overlap would cause it to try to countdown all of epoch time.
2017-10-11 20:24:39 -04:00
Isaac Connor c7626cab94 fix dash 2017-10-10 12:15:41 -07:00
Isaac Connor 7f50a13074 add Event disk space recalc to zmaudit 2017-10-10 12:11:59 -07:00
Isaac Connor 06c61f0324 allow periods in monitor name 2017-10-10 10:40:27 -07:00
digital-gnome d5799cbf6f nph-zms alarmcues 2017-10-08 22:36:15 -04:00
digital-gnome 65ce6df622 scalingfix
changing the scale now works with video.js and alarmcues.  some whitespace fixes
2017-10-08 21:46:26 -04:00
digital-gnome c41ef177c2 JS alarmCues 2017-10-08 21:45:05 -04:00
digital-gnome c39cf77a9c removealarmcuesPHP
removed the PHP rendering and placement code
2017-10-08 21:42:12 -04:00
Isaac Connor d4cf84f7e6 Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
Isaac Connor b56a976d7a fixes to montage review and cleanup in group filtering/editing 2017-10-05 10:46:04 -04:00
Isaac Connor 54949db0b5 spacing/google code style 2017-10-04 10:48:37 -04:00
Isaac Connor 995809ccb7 fix play/pause while editing zone 2017-10-04 10:48:14 -04:00
digital-gnome 5bbe9b40e7 renderAlarmCues function
Generates the html for alarmcues and passes it to JS var
2017-10-03 19:26:48 -04:00
Isaac Connor c46769495b Merge pull request #22 from digital-gnome/storageareas-navigation
Storageareas navigation
2017-10-03 10:18:44 -04:00
digital-gnome 9b241ee370 Also change class
With the css class properly set it turns out this wasn't working.
2017-10-02 15:41:04 -04:00
Isaac Connor 16a731af1c fix path when changing status. 2017-10-02 11:55:17 -04:00
Isaac Connor 15ba7d2a35 fixes 2017-10-02 11:25:51 -04:00
digital-gnome 48a3e5eaa6 Move logic to .js file. 2017-09-30 16:35:03 -04:00
digital-gnome e339b9e12a Merge branch 'storageareas-Navigationfix' into storageareas-navigation 2017-09-30 15:09:32 -04:00
digital-gnome 5f203fc813 JS logic for video.js navigation 2017-09-30 14:24:59 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
digital-gnome 22af70601e Convert to ampersand in filters
Querys weren't working because it was passing & instead of &.  Nothing else appeared to be using these.
2017-09-29 21:49:58 -04:00
Isaac Connor d69b16df24 add group filter to montagereview 2017-09-26 11:28:19 -04:00
digital-gnome cc4b6cd0b0 switch to jquery
switched both scaleslider and speedslider to jquery
2017-09-25 22:14:46 -04:00
Isaac Connor fef503f90c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-09-23 13:42:44 -04:00
Isaac Connor 8ada30ff8c add a group filter to montage 2017-09-23 13:42:13 -04:00
digital-gnome a5f0103601 revert jquery change to speed slider
Scale was using getElementById but speed was changed to jquery.  It wasn't working so I just changed it to match scale.
2017-09-14 18:00:23 -04:00
Isaac Connor edb7762cf3 Merge branch 'master' into storageareas 2017-09-11 16:57:08 -04:00
ralimi 58a9107675 Fix incorrect links to transparent.png and index.php (#1982)
* Fix install location for config files when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Omitted README file that should have appeared in /etc/zm/conf.d

* Fix location for configs when building to alternate directory.

* Fix works, but this should go on a branch instead.

* Fix works, but this should go on a branch instead.

* Fix location for configs when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Remove double quotes. This is a list of paths.

* Allow SSL database connection to be secured with SSL.

* Fix incorrect variable name

* Fix PHP syntax errors

* SSL connection parameters must also be passed in API.

* Fix links pointing at transparent.gif

* Use relative path to index.php instead of absolute.

The installation may not be rooted at / on the server.
2017-09-10 11:49:53 -04:00
Isaac Connor 087b7abb94 Merge branch 'master' into fix_event_viewing 2017-08-14 10:41:04 -04:00
Isaac Connor c60939e824 fix absolute path to index.php in console.js 2017-08-11 09:08:00 -04:00
Isaac Connor 7cb4090d7d can't use jquery like that 2017-08-03 12:41:43 -04:00
Isaac Connor 8bbad9adf8 braces, spaces 2017-07-13 17:35:06 -04:00
Isaac Connor 37003aebcf Merge branch 'master' into storageareas 2017-07-13 11:07:06 -04:00
Isaac Connor f7a99a1106 make montagereview not load all events and frames at once, so that it doesn't use up all memory 2017-07-13 11:06:08 -04:00
Isaac Connor 22e957ba46 clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100% 2017-07-12 12:49:01 -04:00
Isaac Connor 148d7066f9 Merge branch 'master' into storageareas 2017-07-11 16:15:02 -04:00
Isaac Connor 0eb7bfabf2 put the ajax query back to a post 2017-07-07 12:15:09 -04:00
Isaac Connor 21881235f9 merge changeWidth and changeHeight 2017-07-07 09:31:53 -04:00
Isaac Connor 7533d09631 increase log query time minimum to 2 seconds. 1 is too frequent. 2017-07-06 11:42:35 -04:00
Isaac Connor c3c6459052 Merge branch 'montagereview_rework' into storageareas 2017-07-05 15:34:02 -04:00
Isaac Connor 1e21beb1cd use instead of document.getElementById 2017-07-05 14:25:44 -04:00
Isaac Connor d61dfcd410 scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:23:01 -04:00
Isaac Connor 720748a731 code cleanup mostly. scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:22:44 -04:00
Isaac Connor 8c19b129d7 more wip 2017-07-04 12:33:01 -04:00