ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,382 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

1231 Commits

Author SHA1 Message Date
Isaac Connor d039227f79 Merge branch 'master' into storageareas 2017-04-12 13:51:10 -04:00
Isaac Connor 92a2d6f4f2 hide the video, let's stick with jpeg's, which will be auto-generated 2017-04-07 13:20:28 -04:00
Isaac Connor 8f51331472 fix timeline view by using view=image instead of direct path 2017-04-07 13:20:04 -04:00
Isaac Connor 2b9a0f96d3 remove   and break over multiple lines 2017-04-05 16:10:06 -04:00
Isaac Connor d611840750 whitespace, handle NaN in limitArea 2017-04-05 16:09:40 -04:00
Isaac Connor c5ff45922f fix zone edit height 2017-04-05 16:09:06 -04:00
Andrew Bauer a10d52a3e1 Merge pull request #1844 from connortechnology/fix_1812 
fix Monitors filtering SQL
 2017-04-03 20:06:39 -05:00
Isaac Connor 58d119d9ed Merge branch 'fix_1762' into storageareas 2017-03-31 13:38:59 -04:00
Isaac Connor 514c83d3e9 whitespace and add a test for ->Triggers being an array 2017-03-31 12:01:37 -04:00
Isaac Connor d3f6ab3d29 fix Monitors filtering SQL 2017-03-30 13:06:54 -04:00
Isaac Connor 56476a7774 uppercase SQL 2017-03-30 13:05:10 -04:00
Isaac Connor 4f2dcdacb4 update, remove styles and fix the sql for limiting monitors 2017-03-30 13:04:16 -04:00
Isaac Connor dd4550406f remove styles from montagereview and stick them in a view-specific css 2017-03-30 13:03:46 -04:00
Isaac Connor 7e3b27a130 Test for Controllable as well as ControlId 2017-03-30 10:49:02 -04:00
Isaac Connor 5ea77f0781 Make zones a link to zones_overview 2017-03-30 10:45:55 -04:00
Isaac Connor 4d2fb6b7f8 don't need to reload when deleting. The row will no longer be in there 2017-03-27 13:13:48 -04:00
Isaac Connor 7b63461517 attempt to support redirecting to the given url instead of just refreshing 2017-03-27 13:13:08 -04:00
Isaac Connor 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
Isaac Connor 7360619941 Merge branch 'master' into storageareas 2017-03-24 11:53:45 -04:00
Isaac Connor eaca58bb7c Merge pull request #1815 from mnoorenberghe/postlogin 
Properly escape postLoginQuery. Fixes #1797
 2017-03-21 10:27:13 -04:00
Isaac Connor badbf1c74c Merge pull request #1816 from mnoorenberghe/flat_window_sizes 
Increase default window sizes for the flat theme. Fixes #1059
 2017-03-20 13:10:13 -04:00
Isaac Connor 70246ce55a whitespace corrections and ensure that options[width] and options[height] are defined 2017-03-20 12:10:28 -04:00
Andrew Bauer 2dcd95bc7f Merge pull request #1504 from ZoneMinder/improve_filter 
Improve filter
 2017-03-18 21:12:58 -05:00
Matthew Noorenberghe 91ad6afffb Increase default window sizes for the flat theme. Fixes #1059 
Used the computed height of <html> and rounded up the nearest multiple of 5.
 2017-03-17 22:24:42 -07:00
Matthew Noorenberghe ea5342abd2 Properly escape postLoginQuery. Fixes #1797 2017-03-17 21:05:28 -07:00
Isaac Connor 8834109812 code style and whitespace changes 2017-03-17 09:59:23 -04:00
Isaac Connor d9c665b021 Merge branch 'fix_crash_with_invalid_zones' into storageareas 2017-03-17 09:35:11 -04:00
Andrew Bauer 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
Isaac Connor 5bccd92b68 fix scoping of scale var 2017-03-16 09:53:53 -04:00
Isaac Connor 9f99d34807 fix calls to getStreamHTML 2017-03-13 14:22:33 -04:00
Isaac Connor 14c4a156c6 set img.src='' first so that Chrome closes the old stream. 2017-03-06 20:21:12 -05:00
Isaac Connor 4df12ae370 Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height 2017-03-06 17:30:00 -05:00
Isaac Connor d3f7451736 Merge branch 'storageareas' into montage_width_height 2017-03-06 16:56:18 -05:00
Isaac Connor 4fc0aead70 wip 2017-03-01 15:26:40 -05:00
Isaac Connor c3a52272d8 implement changeWidth, changeHeight and alter getStreamHTML to take an array of options 2017-02-27 20:56:14 -05:00
Isaac Connor a0dd36d869 add width and height scale dropdowns 2017-02-27 16:40:40 -05:00
Isaac Connor 186e5ba866 Merge branch 'master' into storageareas 2017-02-21 09:48:00 -05:00
Manojav Sridhar 11b90e6011 fix usage of wrong key 2017-02-17 12:37:58 -05:00
Isaac Connor 980b088d57 google style and add label tags around Scale 2017-02-17 09:19:54 -05:00
Isaac Connor aeedfe8d74 fix some whitespacing 2017-02-14 09:11:54 -05:00
SteveGilvarry 9716c4ef89 Add Option help 2017-02-05 18:43:47 +11:00
SteveGilvarry c72704bf0b Change descriptions for ffmpeg methods and put TCP first. 2017-02-05 15:34:06 +11:00
Isaac Connor e3edbf40cf make url full width 2017-02-02 12:16:40 -05:00
Isaac Connor 7b73eb350f update to current. 2017-02-02 12:15:16 -05:00
Isaac Connor d8c79cb750 fixup header and sidebar layout 2017-02-02 11:31:16 -05:00
Isaac Connor 6f6eacaa72 fixup classic and dark skins 2017-01-30 21:45:48 -05:00
Isaac Connor 89022fff0c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-30 21:16:26 -05:00
Isaac Connor f3378207c0 make navbar static instead of fixed, sync up dark theme, and improve storage editing styles 2017-01-30 21:16:21 -05:00
Isaac Connor ad2e00166a use isset 2017-01-30 19:53:08 -05:00
Isaac Connor 4543b3e1b1 include jquery-ui instead of using a cdn version 2017-01-30 19:17:14 -05:00