7725d46808
use the same port as the stream
2017-10-19 12:45:24 -07:00
d4b0c504fe
fix Server and Storage dropdowns
2017-10-19 12:44:33 -07:00
85ebb0716d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-19 09:50:13 -04:00
cf2eace2c7
improve htmlSelect and add Storage and Server filters to console
2017-10-19 09:50:07 -04:00
97227e051e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-18 20:46:41 -04:00
666233af54
fix mving capture_file_format to staticCOnfig
2017-10-18 20:46:26 -04:00
32ba53cf1b
turn off database debugging
2017-10-18 16:37:45 -04:00
b11a514823
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-18 13:27:13 -04:00
c281467e69
Store server and storage filters in session. Add storage and server filters to console. WIP
2017-10-18 13:24:41 -04:00
a6ccf9a689
Merge sjc04p1fviap02.teslamotors.com:ZoneMinder into storageareas
2017-10-18 13:23:53 -04:00
10accc4226
google code style
2017-10-18 10:23:40 -07:00
965e1e8bc1
improve readability of debug statement
2017-10-18 10:22:53 -07:00
f81471da09
google code style
2017-10-18 10:22:37 -07:00
3436c65aab
minor logic improvement
2017-10-18 10:22:15 -07:00
4b30dd540c
tabs to spaces
2017-10-18 10:21:54 -07:00
6e63cd378f
whitespace
2017-10-18 09:44:07 -07:00
32c79f8d23
Add a disk space total to event list
2017-10-18 09:43:51 -07:00
a4fe76a7fc
fix currentTime additions, tweaks, debug
2017-10-17 11:53:58 -07:00
9b809c357b
Fix Bulk frame calculations
2017-10-17 11:53:34 -07:00
1a13157416
adjust times by client and server utc offsets
2017-10-17 10:10:53 -07:00
a0f54371ca
adjust times by client and server utc offsets
2017-10-17 10:10:48 -07:00
c363b5a190
fix some missing break lines in output
2017-10-17 10:10:20 -07:00
e31e106612
fix loading virtual frame from bulk frames
2017-10-17 10:09:30 -07:00
ba4e5572d6
add setting of values to anonymouse member function
2017-10-17 10:09:14 -07:00
92ff3d9606
Tidy up
2017-10-17 11:50:47 -04:00
4cd59611da
fix when filters are in a popup
2017-10-16 13:46:09 -07:00
340b39ad54
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-10-16 12:21:26 -07:00
75b4de94a7
fix bad char
2017-10-16 12:21:19 -07:00
2fb0acfcc3
remove cellspacing=
2017-10-16 12:20:26 -07:00
29a50626e0
cleanup
2017-10-16 12:19:38 -07:00
87d9108290
increase width of events
2017-10-16 12:19:22 -07:00
f81bac530d
increase function popup height
2017-10-16 15:16:54 -04:00
9e1893311d
google code style
2017-10-16 15:16:33 -04:00
7ceeef55fc
rough in figuring out a frame in between bulk frames
2017-10-16 15:16:19 -04:00
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
2354e9679e
fix seconds calculation when mousing over
2017-10-16 12:26:58 -04:00
69c3fce87e
impose minimum size of timeline, reduce extra redraws on initial load
2017-10-16 12:03:38 -04:00
b862bfd3d2
impose minimum size of timeline, reduce extra redraws on initial load
2017-10-16 12:03:33 -04:00
5c0d8384d9
code style and quotes
2017-10-16 08:31:35 -07:00
ed92abfc76
Add Type to Storage Editing
2017-10-16 08:31:05 -07:00
345d9749ce
Add Type to Storage Editing
2017-10-16 08:31:01 -07:00
c8cb00e57e
fix typo
2017-10-16 08:30:28 -07:00
ecd66edbd6
Merge pull request #38 from digital-gnome/storageareas-progressbarupdate
...
progressBar and navigation
2017-10-16 09:15:30 -04:00
8c3c5e4d50
google code style
2017-10-15 16:52:43 -04:00
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
10cdbf30ea
reduce extra ajax calls
2017-10-15 16:46:58 -04:00
3a4a7ada41
progressBar conversion
...
Convert progressBar to jquery and imporove granularity and performance
2017-10-15 16:46:57 -04:00
005190ab44
Merge pull request #36 from digital-gnome/montagereview-ordering
...
MontageReview ordering
2017-10-15 15:23:40 -04:00
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
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
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
digital-gnome
Daniel Hodgson