ddb7305aab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-02 09:11:55 -04:00
13b192a63e
remove title and close
2017-10-02 09:03:49 -04:00
48a3e5eaa6
Move logic to .js file.
2017-09-30 16:35:03 -04:00
e339b9e12a
Merge branch 'storageareas-Navigationfix' into storageareas-navigation
2017-09-30 15:09:32 -04:00
7c72ff1fd9
Navigation buttons for video.ja
2017-09-30 14:25:00 -04:00
0e2b7d1b52
End of video logic
2017-09-30 14:25:00 -04:00
5f203fc813
JS logic for video.js navigation
2017-09-30 14:24:59 -04:00
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
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
5f42bf4fe5
Change CSS to class, add class to php
...
I needed the styling for the video.js buttons. The fallback mjpeg player used ids.
2017-09-29 21:47:52 -04:00
6a0da487eb
add Parent Group selection to Group Edit
2017-09-28 12:37:15 -04:00
03d25ef10a
more visually appearling code for hiding buttons. Remove cellspacing=0 on the table.
2017-09-27 17:32:42 -04:00
b5699dcac3
google code style
2017-09-26 17:14:27 -04:00
d69b16df24
add group filter to montagereview
2017-09-26 11:28:19 -04:00
00c33aa758
remove extra /div
...
I somehow let an extra /div slip into the commit for making archive work.
2017-09-25 22:14:53 -04:00
cc4b6cd0b0
switch to jquery
...
switched both scaleslider and speedslider to jquery
2017-09-25 22:14:46 -04:00
fef503f90c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-23 13:42:44 -04:00
8ada30ff8c
add a group filter to montage
2017-09-23 13:42:13 -04:00
ab3f15b7c0
Add logic for Archive link on initial load
...
Javascript appears to control this but it was not firing on initial load. Added php logic.
2017-09-14 18:00:35 -04:00
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
a78e568378
Change storage path text box from url to text
...
With the text box set as url you can't use a standard unix path
2017-09-14 18:00:02 -04:00
54b8cce5e4
fix tabs to spaces
2017-09-11 16:57:51 -04:00
edb7762cf3
Merge branch 'master' into storageareas
2017-09-11 16:57:08 -04:00
496ba70819
remove checks for empty and just check for true ( #1980 )
...
Yeah I agree. I think the exists was from pre-object method days.
2017-09-11 13:27:17 -04:00
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
42263bf39a
pass mode when getting mp4 download link
2017-09-08 12:29:10 -04:00
9a6bfb2d02
fix some quotes, double to single
2017-08-22 09:44:45 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
087b7abb94
Merge branch 'master' into fix_event_viewing
2017-08-14 10:41:04 -04:00
c60939e824
fix absolute path to index.php in console.js
2017-08-11 09:08:00 -04:00
6562d5eb47
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-08-09 09:54:34 -04:00
928c4651a6
fix braces, spacing
2017-08-09 09:54:27 -04:00
7cb4090d7d
can't use jquery like that
2017-08-03 12:41:43 -04:00
5a73c38237
video storage fixes ( #1958 )
...
* use a monitor object instead of just a db array.
* fix braces, spacing, move pod docs to bottom
* Fix memleak by freeing input and output frames
* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
6d46b36c80
Hide close button if not in a popup
2017-08-01 14:21:50 -04:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
33ce55584f
Merge branch 'master' into storageareas
2017-07-26 10:48:42 -04:00
30057ddffe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-26 10:38:25 -04:00
1cfd657168
put back the preg_replace that strips usernames and passwords from monitor source
2017-07-26 10:22:57 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
3bd9d96027
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-21 10:54:57 -04:00
457d909c88
fix quotes
2017-07-21 10:54:33 -04:00
c98255dd75
Merge pull request #1948 from connortechnology/fix_empty_monitor_source_column
...
Fix empty monitor source column
2017-07-14 13:10:52 -05:00
1a8638f3dd
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-07-14 11:50:01 -04:00
89bcfc4e28
fix incorrect gpl license text mailing address
2017-07-14 10:39:50 -05:00
d13d7e9050
recode the bit that outputs the link under source so that it defaults to Monitor # under all situations
2017-07-14 09:57:25 -04:00
df0497b3a7
always use onmouseover, as we can now pull images fairly quickly from the mp4
2017-07-14 09:25:53 -04:00
8bbad9adf8
braces, spaces
2017-07-13 17:35:06 -04:00
a16d01a931
use less ram loading events
2017-07-13 17:34:45 -04:00
37003aebcf
Merge branch 'master' into storageareas
2017-07-13 11:07:06 -04:00
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
0df6ac2895
Merge branch 'master' into storageareas
2017-07-13 11:04:51 -04:00
403dca78fb
break up a long line
2017-07-13 10:26:24 -04:00
a5f9c01298
fixes braces and spacing and add some debug lines when the onvif-probe output doesn't match what is expected
2017-07-13 10:26:09 -04:00
aff7e94725
default to TCP for Method
2017-07-13 10:23:30 -04:00
363303efa9
use isset instead of empty to get rid of warning
2017-07-13 10:08:36 -04:00
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
c9689aa010
fix braces,spacing,quotes. Change form method to post
2017-07-12 10:58:20 -04:00
bd681de955
fix braces
2017-07-12 10:57:45 -04:00
148d7066f9
Merge branch 'master' into storageareas
2017-07-11 16:15:02 -04:00
dfd1c2844a
remove storageId
2017-07-11 11:28:15 -04:00
0eb7bfabf2
put the ajax query back to a post
2017-07-07 12:15:09 -04:00
4128f5861f
Merge pull request #1940 from connortechnology/montagereview_rework
...
Montagereview rework
2017-07-07 08:34:01 -05:00
21881235f9
merge changeWidth and changeHeight
2017-07-07 09:31:53 -04:00
d3ec50aa69
various fixes plus use global db functions in logger
2017-07-06 17:45:23 -04:00
7533d09631
increase log query time minimum to 2 seconds. 1 is too frequent.
2017-07-06 11:42:35 -04:00
c372787882
fix typo
2017-07-06 10:50:56 -04:00
4aba4178da
fix spacing
2017-07-06 10:50:07 -04:00
e892841d7e
Fix typo
2017-07-06 10:49:54 -04:00
cf0944f0ad
spacing and quotes
2017-07-06 10:49:36 -04:00
48d1174dd6
hide buttons when using videojs
2017-07-06 10:49:27 -04:00
48373f0d8b
fix filters on console. filter object now has terms under a Query array
2017-07-06 10:49:10 -04:00
d892b94819
spacing
2017-07-06 09:38:30 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
6b2e23e1a5
Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework
2017-07-05 14:27:46 -04:00
1e21beb1cd
use instead of document.getElementById
2017-07-05 14:25:44 -04:00
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
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
0b4a2b41cc
fix scale on initial montage load. Replace calls to functions.php/getStreamSrc with object based call
2017-07-05 14:20:50 -04:00
8c19b129d7
more wip
2017-07-04 12:33:01 -04:00
f87a89a5ce
more fixes
2017-07-04 11:51:23 -04:00
6fc1581b9e
use a monitor object instead of just a db array.
2017-06-28 20:33:53 -04:00
8b1459a510
fixes for cambozola on ie, and fixes to setting fixed widths
2017-06-28 15:17:55 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
892f3a06c7
wip
2017-06-23 08:32:09 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5e75588bfb
Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause
2017-06-21 17:14:02 -04:00
375e4a3e9c
More filter UI fixes
2017-06-20 10:45:16 -04:00
5bdfb8ae4e
add a question mark to delete confirm message and just submit the form
2017-06-20 09:09:21 -04:00
5df4494c6c
make Filters a main window view instead of a popup
2017-06-20 09:08:57 -04:00
965b306ebc
continue redoing filters
2017-06-19 13:24:02 -04:00
1d9e0b7d69
fix saving filters
2017-06-19 10:18:44 -04:00
75c11431e6
deprecate filtersavepopup
2017-06-16 11:10:25 -04:00
3225891843
update/fix filter behaviour
2017-06-15 15:45:43 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
1f14870b38
updates, fix merge problems
2017-06-14 15:35:35 -04:00
e2139920a8
change some more quotes
2017-06-14 15:09:21 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
c11a219b9f
Merge pull request #1896 from connortechnology/dragndrop_monitor_sorting
...
Dragndrop monitor sorting
2017-06-12 20:49:51 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
c6a1518548
remark out call to set progressBarWidth, but that should never change and it uses a var that isn't global barWidth
2017-06-08 14:03:07 -04:00
cac5819331
update call to getStreamSrc to use ->getStreamSrc. Also remove extraneous canView(Event)
2017-06-08 14:02:27 -04:00
b4bdc1fd6b
Merge branch 'master' into dragndrop_monitor_sorting
2017-06-06 20:39:58 -04:00
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
cfa292a204
update widths of monitors when selecting a layout
2017-06-05 19:53:19 -04:00
e1da754ff1
scale zones svg as well when changing width/height/scale
2017-06-05 13:25:27 -04:00
bfa724d06c
fix spacing
2017-06-05 11:11:34 -04:00
a9183a1599
more quotes
2017-06-05 09:40:19 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
be77269acb
fix merge messup
2017-06-04 17:40:54 -04:00
a9268d10e3
fix the use of ZM_OPT constants in javascript. Instead, check for existence of the element in the form.
2017-06-02 12:21:12 -04:00
555a667035
fix filter button
2017-06-02 12:12:59 -04:00
352ea6b6ae
spacing
2017-06-02 12:12:41 -04:00
e47adcf6cc
the tfoot has to come after the tbody
2017-06-01 09:36:00 -04:00
73ca07792b
double quotes to single quotes
2017-05-31 22:11:54 -04:00
5c67c87147
remove deprecated cellspacing attr on table
2017-05-31 22:08:44 -04:00
a940fe429c
deprecate the use of the center tag, and only put in the development h3 if it has contents
2017-05-31 22:08:05 -04:00
1df147e183
adjust spacing
2017-05-31 22:01:35 -04:00
502cb6a7d8
fix spacing
2017-05-31 21:34:38 -04:00
83da2dfa05
double to single quotes
2017-05-31 21:30:19 -04:00
98b49fb64d
quotes, spacing
2017-05-31 21:28:40 -04:00
17c8224733
begin to ahndle imageData not being populated
2017-05-31 20:55:10 -04:00
2b9134512f
remove leftover
2017-05-31 20:45:21 -04:00
8596891e4d
fix double to single quote mistakes
2017-05-31 12:55:27 -04:00
cbe7924041
fix spacing
2017-05-30 19:53:02 -04:00
83d6f415b3
cleanup whitespace
2017-05-30 14:07:37 -04:00
b96f5cf49d
more merges/fixes from SA
2017-05-30 13:50:24 -04:00
8b3b9eb30e
more merges/fixes from SA
2017-05-30 13:47:30 -04:00
e9adc3bc5b
restore SA version
2017-05-30 13:14:27 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
5bbe13f98f
update cycle from SA
2017-05-30 11:53:05 -04:00
26131f8a10
double quotes to single quotes
2017-05-30 11:52:48 -04:00
5c5aafb1e8
white space and a check for mid being set to quiet error messages
2017-05-30 11:37:48 -04:00
59d00b20b1
fix fetchImage
2017-05-30 11:35:52 -04:00
f88abfcb4d
the liveStream element now has the monitorId appended to it, to be consistent with montage so we can reuse code
2017-05-30 11:26:57 -04:00
bb051fd509
fix merge conflicts
2017-05-25 15:29:31 -04:00
7cfa0b12ec
Merge branch 'dragndrop_monitor_sorting' into storageareas
2017-05-25 15:26:04 -04:00
123aaad080
add applySort function, and the sorting init code
2017-05-25 15:03:30 -04:00
229c8c6e23
Mmove Right buttons to the left, because there is no more room on the right anymore, move the script that sets up the sorting to js/console.js
2017-05-25 15:03:10 -04:00
afce83d289
Merge branch 'master' into dragndrop_monitor_sorting
2017-05-25 14:31:41 -04:00
31b5a99b43
remove old code to do sequence up/down arrows, replace with jquery sortable
2017-05-25 14:30:07 -04:00
043d722651
braces,whitespace
2017-05-25 14:26:49 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
13265a8f4f
undo StorageAreas contents
2017-05-23 10:41:21 -04:00
d988b9b6d5
improve efficiency of progress bar updating/drawing. Add some debug
2017-05-19 12:25:26 -04:00
641384f38d
spacing
2017-05-19 12:24:59 -04:00
f4008e2c6a
Merge branch 'master' into storageareas
2017-05-19 11:20:33 -04:00
c64391c98d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 11:00:37 -04:00
29b43cfd0a
Whitespace, google style, localized video.js ( #1890 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
* Merge updates from sa branch
* Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-19 10:23:51 -04:00
377cc94acb
Merge more changes to make video storage ui's work ( #1889 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
2017-05-18 15:11:26 -04:00
bc1a2dcb21
whitespace & braces
2017-05-18 14:55:53 -04:00
44c07c4e7a
put back proper sql
2017-05-18 14:42:55 -04:00
84a224d712
put back the AS E
2017-05-18 14:39:58 -04:00
4763ace165
Merge branch 'master' into storageareas
2017-05-18 14:24:09 -04:00
da33cbe1f9
fix
2017-05-18 14:09:46 -04:00
158741a7d8
fix whitespace
2017-05-18 14:07:56 -04:00
319ad7fede
fix whitespace
2017-05-18 14:07:51 -04:00
8b0f319834
fix whitespace
2017-05-18 14:06:13 -04:00
9fd9a75669
fix whitespace, braces, simplify sql
2017-05-18 14:04:24 -04:00
29bcab9204
fix Debug to Logger::Debug
2017-05-18 13:54:06 -04:00
d1c61a252f
fix whitspace/braces
2017-05-18 13:50:56 -04:00
3ec4e1bfe7
fix merge
2017-05-18 12:59:09 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
c859f7291c
Feature h264 videostorage ( #1882 )
...
* Moved writing of configure options from Controller to Model. Fixes #191 .
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a9
2017-05-15 22:02:48 -04:00
68aea50ca9
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-15 16:19:57 -04:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
f832dd30ea
Merge pull request #1817 from mnoorenberghe/eslint
...
Add eslint configuration files extending Google's rules
2017-05-10 09:04:51 -04:00
06009f3b16
Merge pull request #1661 from connortechnology/add_scale_to_frame_view
...
Add scale to frame view
2017-05-10 07:56:36 -05:00
9ac20999b3
rough in
2017-05-05 21:11:23 -04:00
7be2ee0e1b
add back videoEvent
2017-05-05 17:19:02 -04:00
0f5142fa19
bring back video popup
2017-05-05 17:18:48 -04:00
cb99d709c5
add debug
2017-05-05 16:37:12 -04:00
64193c3368
turn status ajax calls to gets instead of posts
2017-05-05 16:18:12 -04:00
19b2de6d28
add a Download MP4 button
2017-05-05 15:13:25 -04:00
355eb1beef
when mouseover the thumbnail, stream the video
2017-05-05 14:25:25 -04:00
3b6cf74ed3
add auth_hash to ajax calls
2017-05-05 11:53:40 -04:00
20c699366e
scale is a percentage, so use the rescale function
2017-04-28 11:10:43 -04:00
5a2ef571ef
fix scaling, zones now work. Add a Show/Hide Zones at the top
2017-04-24 14:47:30 -04:00
ef6c675c6a
work in progress, rough in adding the svg zones to montage
2017-04-24 11:11:44 -04:00
3db38eb474
limit points to the limits of the monitor
2017-04-19 16:12:12 -04:00
dd4ea635e8
remove rotate, as the video file itself has the rotate set
2017-04-19 13:12:15 -04:00
f97e074393
braces fixes
2017-04-12 16:16:56 -04:00
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
92a2d6f4f2
hide the video, let's stick with jpeg's, which will be auto-generated
2017-04-07 13:20:28 -04:00
8f51331472
fix timeline view by using view=image instead of direct path
2017-04-07 13:20:04 -04:00
2b9a0f96d3
remove and break over multiple lines
2017-04-05 16:10:06 -04:00
d611840750
whitespace, handle NaN in limitArea
2017-04-05 16:09:40 -04:00
a10d52a3e1
Merge pull request #1844 from connortechnology/fix_1812
...
fix Monitors filtering SQL
2017-04-03 20:06:39 -05:00
58d119d9ed
Merge branch 'fix_1762' into storageareas
2017-03-31 13:38:59 -04:00
514c83d3e9
whitespace and add a test for ->Triggers being an array
2017-03-31 12:01:37 -04:00
d3f6ab3d29
fix Monitors filtering SQL
2017-03-30 13:06:54 -04:00
56476a7774
uppercase SQL
2017-03-30 13:05:10 -04:00
4f2dcdacb4
update, remove styles and fix the sql for limiting monitors
2017-03-30 13:04:16 -04:00
7e3b27a130
Test for Controllable as well as ControlId
2017-03-30 10:49:02 -04:00
5ea77f0781
Make zones a link to zones_overview
2017-03-30 10:45:55 -04:00
4d2fb6b7f8
don't need to reload when deleting. The row will no longer be in there
2017-03-27 13:13:48 -04:00
8ef7a708bd
updates in filters, try to get the new filter loaded when saving with a new name
2017-03-27 13:12:37 -04:00
7360619941
Merge branch 'master' into storageareas
2017-03-24 11:53:45 -04:00
eaca58bb7c
Merge pull request #1815 from mnoorenberghe/postlogin
...
Properly escape postLoginQuery. Fixes #1797
2017-03-21 10:27:13 -04:00
70246ce55a
whitespace corrections and ensure that options[width] and options[height] are defined
2017-03-20 12:10:28 -04:00
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
c7955cd1b6
Add eslint configuration files extending Google's rules
2017-03-18 00:02:17 -07:00
ea5342abd2
Properly escape postLoginQuery. Fixes #1797
2017-03-17 21:05:28 -07:00
8834109812
code style and whitespace changes
2017-03-17 09:59:23 -04:00
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
9681a444b4
Merge pull request #1765 from SteveGilvarry/ffmpeg_url
...
Align Method description to what it is actually doing
2017-03-16 09:32:30 -05:00
5bccd92b68
fix scoping of scale var
2017-03-16 09:53:53 -04:00
9f99d34807
fix calls to getStreamHTML
2017-03-13 14:22:33 -04:00
14c4a156c6
set img.src='' first so that Chrome closes the old stream.
2017-03-06 20:21:12 -05:00
4df12ae370
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
2017-03-06 17:30:00 -05:00
d3f7451736
Merge branch 'storageareas' into montage_width_height
2017-03-06 16:56:18 -05:00
4fc0aead70
wip
2017-03-01 15:26:40 -05:00
c3a52272d8
implement changeWidth, changeHeight and alter getStreamHTML to take an array of options
2017-02-27 20:56:14 -05:00
a0dd36d869
add width and height scale dropdowns
2017-02-27 16:40:40 -05:00
186e5ba866
Merge branch 'master' into storageareas
2017-02-21 09:48:00 -05:00
11b90e6011
fix usage of wrong key
2017-02-17 12:37:58 -05:00
980b088d57
google style and add label tags around Scale
2017-02-17 09:19:54 -05:00
9716c4ef89
Add Option help
2017-02-05 18:43:47 +11:00
c72704bf0b
Change descriptions for ffmpeg methods and put TCP first.
2017-02-05 15:34:06 +11:00
7b73eb350f
update to current.
2017-02-02 12:15:16 -05:00
7d451e1e41
float the scale control right, add css for other skins
2017-01-31 11:13:16 -05:00
4a4f62f0a7
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2017-01-31 11:13:16 -05:00
568160e5aa
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2017-01-31 11:13:15 -05:00
f3378207c0
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
2017-01-30 21:16:21 -05:00
129acb5b8e
only show mark column if you have the Monitor Edit ability
2017-01-24 09:30:56 -05:00
7cd2f6c69e
use glyphicon for sort
2017-01-23 21:51:17 -05:00
fdd71a826a
implement dragndrop sorting
2017-01-23 10:12:57 -05:00
9c8b229c74
Fix cutnpaste error
2017-01-14 17:08:13 -05:00
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
2436e40f5d
Merge branch 'master' into storageareas
2017-01-11 10:34:27 -05:00
7ef7a36f39
fix conditional logic in controlcap.js
2017-01-10 17:53:05 -06:00
7ef0c2c9d3
fix deleting filters. We don't need to set fid anymore
2017-01-09 14:58:55 -05:00
cc724a5542
add a question mark to delete confirmation
2017-01-09 14:53:13 -05:00
84183c819c
Merge branch 'master' into storageareas
2017-01-03 09:53:09 -05:00
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
0a90dbac9f
require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path.
2017-01-02 10:35:51 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
2dda2d9e1e
remove unneeded, empty files
2016-12-26 09:49:14 -06:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
f92edc3456
refresh stream url when changing scale
2016-12-21 10:40:47 -05:00
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05:00
708f52beda
Merge branch 'disk_space_in_events' into storageareas
2016-12-13 13:36:18 -05:00
a9548d3f6b
Add a config entry to turn event disk space on/off
2016-12-13 13:34:56 -05:00
30ec67d4c3
Merge branch 'master' into disk_space_in_events
2016-12-13 13:28:32 -05:00
857b4e8345
Merge branch 'master' into improve_filter
2016-12-06 11:58:41 -05:00
9312eed17f
Merge branch 'master' into disk_space_in_events
2016-11-22 10:58:24 -05:00
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -05:00
6bf921a858
Add thumbnanils to the frames view. Also add a content-disposition header and some url mangling to help browsers give a useful filename when doing Save Image As
2016-11-21 12:28:15 -05:00
c360e27b02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-17 13:13:47 -05:00
bb6b0c2d49
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
2016-11-17 12:16:49 -05:00
4eb5ff7aff
Fix Undefined index: loginFailed. Resolves #1684
2016-11-16 19:42:04 -07:00
2bd080a6a6
Merge branch 'master' into storageareas
2016-11-15 08:41:00 -05:00
8f71971209
Show error message upon unsuccessful login. Fixes #1648 ( #1680 )
...
* Add additional post-cmake files to .gitignore
* Add bootstrap 3.3.7
* Load bootstrap css
* Restyle login page, move recaptcha js to <head>
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
* Update doctype to HTML5, add meta tags for mobile browsers
* Move inline Login css to css file
* Remove extra php tag in functions.php
* Show error message upon unsuccessful login. Fixes #1648
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
* Only load bootstrap css in specific views.
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
* Test for invalid login via session variable.
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
* Fix a few typos in login inputs
* Add new fonts directory to web CMakeLists
2016-11-14 21:24:43 -05:00
3b7723ee8f
Merge branch 'master' into storageareas
2016-11-11 22:40:00 -05:00
49d8e35e56
Show available PATH_MAP percent on console ( #1675 )
...
* Add PATH_SWAP percent to console
* add changes to console.php
* use ZM_PATH_MAP instead of ZM_PATH_SWAP
* show the folder name PATH_MAP points to
* use a dash as the delimiter instead of fwd slash
2016-11-11 08:47:08 -05:00
65fe07e7aa
Fix a few typos in login inputs
2016-11-10 23:36:28 -07:00
95d00f70a3
Test for invalid login via session variable.
...
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
2016-11-10 23:29:12 -07:00
0800a69a57
Show error message upon unsuccessful login. Fixes #1648
...
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
2016-11-10 22:51:32 -07:00
227b196a2e
Move inline Login css to css file
2016-11-10 21:48:42 -07:00
eacf6cd415
Restyle login page, move recaptcha js to <head>
...
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
9f43825b92
prevent the end user from slecting an invalid configuration on the PT… ( #1676 )
...
* prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab
* change to console.php should not be in this pr
2016-11-08 22:10:51 -05:00
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
4b3ac63a68
merge master, deprecate qqq()
2016-11-08 11:30:44 -05:00
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
5c62c654ce
fix WatchScale -> EventScale
2016-11-03 16:47:22 -04:00
53166fabf5
Merge branch 'master' into storageareas
2016-11-03 14:59:06 -04:00
cb69d1a693
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2016-11-03 14:57:29 -04:00
bd47439056
Merge pull request #1639 from connortechnology/cookie_scale
...
store the scale value for watch and event views in a cookie, differen…
2016-11-03 12:35:15 -06:00
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
0ea8461192
remove extra s
2016-11-03 09:43:38 -04:00
ca69a79bed
fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist.
2016-10-27 17:05:33 -04:00
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
4defad1352
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:04:43 -04:00
d9a31f7fb6
Merge branch 'master' into storageareas
2016-10-26 13:39:31 -04:00
c74cc54ac0
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2016-10-26 13:34:30 -04:00
98cde11e86
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2016-10-26 13:34:28 -04:00
7b1395a4ea
set default for StorageId to '0' since it can't be NULL anymore
2016-10-20 14:06:09 -04:00
f153e9b8fb
MontageReview should only be visisble to people who can view events. Fix running state
2016-10-20 13:38:12 -04:00
67e14bd12f
move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me.
2016-10-20 13:16:50 -04:00
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
4bb9709cb2
use object methods of Event
2016-10-12 15:39:53 -04:00
dcf6a39bf6
split Event and Monitor into objects and use properties from appropriate object
2016-10-12 15:39:32 -04:00
5b8b9c5345
merge update
2016-10-12 09:24:10 -04:00
b4f065eb75
Convert event view to use Objects
2016-10-12 09:17:57 -04:00
0903ef294f
quick for to make MontageReview work
2016-10-11 17:35:28 -04:00
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
743e8c59f9
google code style and double to single quotes
2016-10-11 12:11:59 -04:00
3801d9e43e
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
2016-10-10 11:27:36 -07:00
96b5af9021
Merge branch 'fix_onvif' into storageareas
2016-10-04 15:00:28 -04:00
ac24865647
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:51 -04:00
09c5e3012a
username and password don't actually have to be specified
2016-10-04 14:09:32 -04:00
21a94a6200
better error message
2016-10-04 10:29:37 -04:00
cf9fa78ca3
work on fixing event view
2016-09-29 09:28:48 -04:00
09f7c9ddf9
Merge pull request #1633 from bhaal2/storageareas
...
Storageareas
2016-09-28 09:43:00 -04:00
994f1d566e
fix [
2016-09-28 09:09:01 -04:00
02a196d98b
add missing ]
2016-09-28 08:30:22 -04:00
6840031ee3
fix auth timeout and user session[username] when checking auth hash for speedup
2016-09-27 11:51:55 -04:00
e04266600e
Merge branch 'fix_auth_timeout' into storageareas
2016-09-27 11:04:12 -04:00
4ce531099c
add an auth field to request=stream results to give the client a new auth hash to use
2016-09-27 11:03:12 -04:00
167214cb01
Merge branch 'cookie_scale' into storageareas
2016-09-27 10:05:16 -04:00
6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
0580ef0c88
whitespace changes
2016-09-26 20:09:09 -04:00
b9b1dd144c
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
2016-09-21 21:41:22 +10:00
33ab9d3098
instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
2016-09-20 12:19:44 -04:00
5f46b8f942
Merge pull request #1621 from connortechnology/fix_1620
...
ptzControl expects a monitor object instead of a dbrow array.
2016-09-15 10:18:26 -04:00
37c559ba3d
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-09-14 12:49:55 -04:00
cf45feea66
quiet the logs on initial view load
2016-09-14 12:49:47 -04:00
17555bf623
Added extra argument 'id' to deleteFilter function to send to delete action for deleting a filter.
2016-09-15 01:57:31 +10:00
67f2ddc404
Changed filter list order back to Name
...
Added extra argument 'Id' to delete button onClick call
2016-09-15 01:55:58 +10:00
cd626a54ee
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:29:44 +10:00
99a212803a
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:29:35 +10:00
cd0e6ba285
StorageId now defaults to 0 and database column now set to NOT NULL. Changed default Id in php to match
2016-09-14 23:56:05 +10:00
33fc47c4b1
StorageId now defaults to 0 (NOT NULL) in the Monitors table, updates to filter.php set the default Id for the default storage area to 0
2016-09-14 23:53:52 +10:00
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
a80881bb98
Merge branch 'fix_1620' into storageareas
2016-09-13 10:03:02 -04:00
54db9f2e3a
ptzControl expects a monitor object instead of a dbrow array.
2016-09-12 21:36:03 -04:00
563f4a9d46
Merge pull request #1505 from ZoneMinder/fix_filter_actions
...
Confirmed check box status is now retained after save and changing filters.
2016-09-11 14:13:51 +10:00
070051d06a
Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
...
For easy pull-requesting
2016-09-09 14:20:03 +02:00
b10c79b4f7
Add translation for 'Montage Review'
2016-09-09 13:26:19 +02:00
6b18184e4a
Remove confusing link to web console
2016-09-09 12:38:30 +02:00
4dc6fc03b3
Add a missing translate()-call
2016-09-09 12:35:34 +02:00
10abe98e91
merge from packet queue. add monitorId to livestream div lookup
2016-09-01 10:15:12 -04:00
5f07911a63
fix spacing
2016-08-31 10:09:42 -04:00
ea34f3d69a
Merge pull request #1576 from ZoneMinder/show_other_zones
...
include polygons for the other zones.
2016-08-15 20:36:16 -05:00
19d46c2d09
Merge branch 'master' into storageareas
2016-08-15 10:45:50 -04:00
a0bc30d3fe
fix the order of analyse/capture being passed
2016-08-12 15:40:47 -04:00
9106675842
pass capture or analyse to getImageSrc
2016-08-12 15:17:13 -04:00
bc4923b555
use instead of for the frame object and pass to getImageSrc which expects an array
2016-08-12 13:50:18 -04:00
cc06a84a0e
increase size of onvifprobe popup
2016-08-09 13:09:47 -04:00
24d471f452
Merge pull request #1503 from ZoneMinder/id_on_console
...
add option to show monitor ID on console
2016-08-06 10:59:03 -05:00
6a0c6cd4f2
Merge branch 'show_other_zones' into storageareas
2016-08-02 13:54:01 -04:00
8093470a2e
make only the editing polygon have a border. Set default for Type when creating a new zone
2016-08-02 12:19:55 -04:00
b522371080
include polygons for the other zones.
2016-08-02 12:02:07 -04:00
4c1c95e3a5
only include the state if canEdit(system) otherwise it gives an auth error
2016-07-22 16:04:42 -04:00
9262d9d14e
remove debug messages on css changing
2016-07-22 16:02:55 -04:00
3504c1d8f5
Add Id to the title for each monitor
2016-07-21 15:02:01 -04:00
8c8461a88e
Update to use Event object and object based createListThumbnail function
2016-07-20 15:20:51 -04:00
bce7369984
Merge branch 'disk_space_in_events' into storageareas
2016-07-19 17:36:15 -04:00
cd43d1fa7a
Rough in Event disk space reporting
2016-07-19 17:34:01 -04:00
4caa20821a
fix
2016-07-14 11:57:06 -04:00
eb0ddc4e32
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
2016-07-14 11:55:27 -04:00
b6c02b563b
turn off host validation
2016-07-14 10:22:09 -04:00
410e154b7f
code style
2016-07-12 10:29:40 -04:00
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
6ab2b33e95
fix merge
2016-06-27 09:10:35 -04:00
6e4c8fa224
need to set the Id when duping
2016-06-24 10:31:15 -04:00
d732d9a49a
fix merge
2016-06-24 10:02:20 -04:00
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
6a8db582ff
whitespacing updates
2016-06-21 12:21:18 -04:00
31a5252afa
apply btn and btn-primary styles to remaining buttons on console
2016-06-21 09:22:32 -04:00
1d1cedce95
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
2016-06-20 12:40:33 -04:00
26bba58c56
Merge branch 'master' into feature-h264-videostorage
2016-06-17 11:09:47 -04:00
3914e0b394
:Merge branch 'fix_zone_edit' into storageareas
2016-06-16 12:04:18 -04:00
0c82e82ae2
Don't update x in updateY and don't update y in updateX as they are not defined.
2016-06-16 12:00:00 -04:00
8e7665d397
use getStreamHTML instead of duplicated code
2016-06-14 12:40:18 -04:00
d5d48bef8a
clean out unused variables and don't scale the popup window. The contents of it won't be scaled.
2016-06-14 12:39:51 -04:00
bfa46e26ee
Use monitor Id instead of the array index. Id is unique, so just use it.
2016-06-14 12:39:15 -04:00
abad7cbf9f
Merge branch 'fix_zone_edit' into storageareas
2016-06-13 09:43:03 -04:00
83ac4cd061
change the input handler from onchange to oninput. Disable form submit when hitting enter
2016-06-13 09:40:04 -04:00
632ec38d7d
Put back in neccessary callt o updateArea
2016-06-12 16:10:24 -04:00
4f2e0edb44
remove unnecssary updateAreas
...
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
c3043c1487
cleanups, remove unneccessary updateArea calls
2016-06-07 21:22:22 -04:00
b2dfdea66e
Merge branch 'fix_zone_edit' into storageareas
2016-06-07 11:45:50 -04:00
593fe2b0c5
update area when points move
2016-06-07 11:40:53 -04:00
bb6adc3012
fix missing space
2016-06-07 09:37:05 -04:00
f0ec2a65ee
Merge branch 'fix_errors_when_event_not_found' into storageareas
2016-06-03 10:47:47 -04:00
380b86614f
put quotes around integer values that will be empty strings if the event is not found
2016-06-03 10:46:21 -04:00
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
a57a3d3186
Merge pull request #1501 from ZoneMinder/fix_zone_edit
...
Fix zone edit
2016-05-31 10:33:31 -05:00
1add5a954a
Merge branch 'fix_filter_actions' into storageareas
2016-05-29 11:37:08 -04:00
9f6f5100fe
also copy Name from the request on update and only show delete button if it has a name
2016-05-29 11:32:18 -04:00
7725109917
Merge branch 'fix_filter_actions' into storageareas
2016-05-27 12:47:32 -04:00
101c93d422
When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object
2016-05-27 12:45:36 -04:00
c4e5299943
sync up auto to Auto
2016-05-27 12:45:04 -04:00
c25b680799
Merge branch 'fix_filter_actions' into storageareas
2016-05-27 11:12:18 -04:00
65e33d6c19
synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter
2016-05-27 11:11:30 -04:00
7277283659
rename AttrServerId to AttrServer, because that is the text that is returned
2016-05-27 10:12:46 -04:00
d52a6f9a95
Merge branch 'improve_filter' into storageareas
2016-05-27 09:57:05 -04:00
3058dd9463
Merge branch 'id_on_console' into storageareas
2016-05-26 12:19:33 -04:00
f461bc1e80
get rid of extra )
2016-05-26 12:18:58 -04:00
05709f3084
Merge branch 'id_on_console' into storageareas
2016-05-26 11:17:41 -04:00
f969186abb
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
2016-05-26 11:15:13 -04:00
730abc9789
make zones unclickable when zm is not running
2016-05-26 09:35:36 -05:00
1972c4116b
Merge pull request #1486 from connortechnology/update_image_view
...
Update image view
2016-05-26 09:05:14 -05:00
7a08d4620f
Merge branch 'master' into storageareas
2016-05-25 10:17:46 -04:00
575f8ec265
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
...
Hide rtspdescribe
2016-05-25 08:44:17 -05:00
8f1596d683
use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr
2016-05-25 09:08:28 -04:00
7cfa2a5eaa
Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone
2016-05-24 16:46:34 -04:00
8fabeb78d3
Merge branch 'fix_zone_edit' into storageareas
2016-05-24 15:55:49 -04:00
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
89f58daf89
Merge branch 'master' into fix_zone_edit
2016-05-24 15:30:56 -04:00
0052bb080c
unlink only if file exists
2016-05-24 12:13:17 -05:00
00abd36af8
fix the other case of the wrong case of rtsp
2016-05-24 12:19:31 -04:00
056eed6df9
fix to show RTSP describe option when switching back to rtsp
2016-05-24 12:15:59 -04:00
bc49aa6aa6
add missing ; and remove extra )
2016-05-24 09:34:36 -04:00
Isaac Connor
Isaac Connor
digital-gnome
Andrew Bauer
ralimi
Isaac Connor
Isaac Connor
Matthew Noorenberghe
Isaac Connor
Manojav Sridhar
SteveGilvarry
Isaac Connor
Andy Bauer
Kyle Johnson
Jeff Vogt
bhaal2
corax
Isaac Connor
Andrew Bauer
Isaac Connor