Commit Graph

9742 Commits

Author SHA1 Message Date
Isaac Connor 10accc4226 google code style 2017-10-18 10:23:40 -07:00
Isaac Connor 965e1e8bc1 improve readability of debug statement 2017-10-18 10:22:53 -07:00
Isaac Connor f81471da09 google code style 2017-10-18 10:22:37 -07:00
Isaac Connor 3436c65aab minor logic improvement 2017-10-18 10:22:15 -07:00
Isaac Connor 4b30dd540c tabs to spaces 2017-10-18 10:21:54 -07:00
Isaac Connor 6e63cd378f whitespace 2017-10-18 09:44:07 -07:00
Isaac Connor 32c79f8d23 Add a disk space total to event list 2017-10-18 09:43:51 -07:00
Isaac Connor a4fe76a7fc fix currentTime additions, tweaks, debug 2017-10-17 11:53:58 -07:00
Isaac Connor 9b809c357b Fix Bulk frame calculations 2017-10-17 11:53:34 -07:00
Isaac Connor 1a13157416 adjust times by client and server utc offsets 2017-10-17 10:10:53 -07:00
Isaac Connor a0f54371ca adjust times by client and server utc offsets 2017-10-17 10:10:48 -07:00
Isaac Connor c363b5a190 fix some missing break lines in output 2017-10-17 10:10:20 -07:00
Isaac Connor e31e106612 fix loading virtual frame from bulk frames 2017-10-17 10:09:30 -07:00
Isaac Connor ba4e5572d6 add setting of values to anonymouse member function 2017-10-17 10:09:14 -07:00
Isaac Connor 92ff3d9606 Tidy up 2017-10-17 11:50:47 -04:00
Isaac Connor 4cd59611da fix when filters are in a popup 2017-10-16 13:46:09 -07:00
Isaac Connor 340b39ad54 Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas 2017-10-16 12:21:26 -07:00
Isaac Connor 75b4de94a7 fix bad char 2017-10-16 12:21:19 -07:00
Isaac Connor 2fb0acfcc3 remove cellspacing= 2017-10-16 12:20:26 -07:00
Isaac Connor 29a50626e0 cleanup 2017-10-16 12:19:38 -07:00
Isaac Connor 87d9108290 increase width of events 2017-10-16 12:19:22 -07:00
Isaac Connor f81bac530d increase function popup height 2017-10-16 15:16:54 -04:00
Isaac Connor 9e1893311d google code style 2017-10-16 15:16:33 -04:00
Isaac Connor 7ceeef55fc rough in figuring out a frame in between bulk frames 2017-10-16 15:16:19 -04:00
Isaac Connor 6bf9e28a1e fix use of api when auth not in use and actually specify which monitor to restart 2017-10-16 10:00:41 -07:00
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