Commit Graph

9867 Commits

Author SHA1 Message Date
Isaac Connor 2354e9679e fix seconds calculation when mousing over 2017-10-16 12:26:58 -04:00
Isaac Connor 69c3fce87e impose minimum size of timeline, reduce extra redraws on initial load 2017-10-16 12:03:38 -04:00
Isaac Connor b862bfd3d2 impose minimum size of timeline, reduce extra redraws on initial load 2017-10-16 12:03:33 -04:00
Isaac Connor 5c0d8384d9 code style and quotes 2017-10-16 08:31:35 -07:00
Isaac Connor ed92abfc76 Add Type to Storage Editing 2017-10-16 08:31:05 -07:00
Isaac Connor 345d9749ce Add Type to Storage Editing 2017-10-16 08:31:01 -07:00
Isaac Connor c8cb00e57e fix typo 2017-10-16 08:30:28 -07:00
Isaac Connor ecd66edbd6 Merge pull request #38 from digital-gnome/storageareas-progressbarupdate
progressBar and navigation
2017-10-16 09:15:30 -04:00
digital-gnome 8c3c5e4d50 google code style 2017-10-15 16:52:43 -04:00
digital-gnome 3a7eee58df improve navigation
Condensed navigation if structure and added handling for crashed zms.  Will now reload whatever event is next.
2017-10-15 16:49:50 -04:00
digital-gnome 10cdbf30ea reduce extra ajax calls 2017-10-15 16:46:58 -04:00
digital-gnome 3a4a7ada41 progressBar conversion
Convert progressBar to jquery and imporove granularity and performance
2017-10-15 16:46:57 -04:00
Isaac Connor 005190ab44 Merge pull request #36 from digital-gnome/montagereview-ordering
MontageReview ordering
2017-10-15 15:23:40 -04:00
Isaac Connor 4530102d85 Merge pull request #37 from Toasty27/patch-1
Fix error when creating DB with zm_create.sql
2017-10-15 15:23:06 -04:00
Daniel Hodgson 581b7262ce Fix error when creating DB with zm_create.sql
The following command:
`mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql`

Throws the following error:
`ERROR 1136 (21S01) at line 603: Column count doesn't match value count at row 1`

This is due to a missing column when inserting into the Storage table on line 603
2017-10-15 01:24:35 -07:00
digital-gnome d523e0e3f1 remove sorting
Don't sort monitors on resize.  Fixes labels not matching graphs
2017-10-13 19:53:25 -04:00
Isaac Connor bc84be6008 Merge pull request #34 from digital-gnome/flat-skin-scrollbar
height 100 causing phantom scroll
2017-10-13 10:06:23 -04:00
digital-gnome 590639039a height 100 causing phantom scroll
Fixes phantom scrollbar in flat skin
2017-10-13 09:01:13 -04:00
Isaac Connor 7f565e318f use the untaint version otherwise we die with error 9 2017-10-13 08:59:32 -04:00
Isaac Connor 48cd4cb55c Merge pull request #33 from digital-gnome/eventvideo-div
move eventvideo div close
2017-10-13 06:09:34 -04:00
digital-gnome 32f9e64a14 make evenVideo wrap just the video 2017-10-12 19:52:23 -04:00
digital-gnome 2913b211db move eventvideo div close
I think I did this.  eventVideo div wasn't properly wrapping everything
2017-10-12 17:38:03 -04:00
Isaac Connor 28ef94fad0 handle an array as a Hint, fixing bandwidth option 2017-10-12 11:43:53 -07:00
Isaac Connor 446d3a92c5 spacing and google code style 2017-10-12 11:43:31 -07:00
Isaac Connor 78d1c1ed20 google code style and quote marks 2017-10-12 11:43:15 -07:00
Isaac Connor 5c7203f2bb Fix File=> File::Find 2017-10-12 11:42:49 -07:00
Isaac Connor e6c0add17e add ZM_BANDWIDTH_DEFAULT 2017-10-12 12:09:05 -04:00
Isaac Connor ad97023732 spacing 2017-10-12 08:54:43 -07:00
Isaac Connor ac1830a40f increase height of bandwidth popup 2017-10-12 08:54:29 -07:00
Isaac Connor b96b2636bb add the update to add Type to Storage 2017-10-12 07:50:43 -07:00
Isaac Connor 8abb8a9259 add Type to Storage 2017-10-12 07:32:48 -07:00
Isaac Connor a1b13a2555 Merge pull request #32 from digital-gnome/navigationPlus
Navigation plus
2017-10-12 09:55:13 -04:00
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 3f01f887aa only count event size when s3 2017-10-11 14:10:53 -04:00
Isaac Connor e16d852248 make DiskSpace be a bigint 2017-10-11 14:07:01 -04:00
Isaac Connor e845af94cc include params when blowing up a dbQuery 2017-10-11 14:06:18 -04:00
Isaac Connor 6b188b74c4 add usage() to generate_apache_config.pl 2017-10-11 14:05:59 -04:00
Isaac Connor 798b4838bd increase group popup height 2017-10-10 16:03:02 -04:00
Isaac Connor 3c7ef72c68 Merge sjc04p1fviap01.teslamotors.com:ZoneMinder into storageareas 2017-10-10 15:40:02 -04:00
Isaac Connor a286b60150 use already loaded Storage object when lading events 2017-10-10 12:39:53 -07:00
Isaac Connor 67cb3a7d3c better human_filesize function 2017-10-10 12:39:36 -07:00
Isaac Connor aaffe475d8 turn off debug 2017-10-10 12:39:23 -07:00
Isaac Connor 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
Isaac Connor 45ec51ed95 Merge sjc04p1fviap01.teslamotors.com:ZoneMinder into storageareas 2017-10-10 15:15:47 -04:00
Isaac Connor c7626cab94 fix dash 2017-10-10 12:15:41 -07:00