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

3107 Commits

Author SHA1 Message Date
Isaac Connor f97e074393 braces fixes 2017-04-12 16:16:56 -04:00
Isaac Connor d039227f79 Merge branch 'master' into storageareas 2017-04-12 13:51:10 -04:00
Isaac Connor d462dfdb77 fix error message when fid not specified 2017-04-07 13:20:54 -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
Isaac Connor 7815f1c539 introduce a redirect flag global variable to allow us to redirect. Which allows to redirect on successful login so we don't get repost popups 2017-04-05 10:05:21 -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 08766b7546 decrease wait time in order to achieve greater throughput. flush after every print so that we don't buffer the whole file 2017-03-31 14:33:00 -04: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 d1a60dedc8 Fix the overzealous use of escapeshellcmd that breaks restarting monitors 2017-03-31 11:59:55 -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 b2db0888ae add a warning if csrf_check returns false 2017-03-30 10:46:13 -04:00
Isaac Connor 5ea77f0781 Make zones a link to zones_overview 2017-03-30 10:45:55 -04:00
Isaac Connor 538658403c Merge pull request #1822 from knnniggett/csrf 
Implement CSRF Mitigation
 2017-03-30 10:39:55 -04:00
Isaac Connor fe223e3b29 remove a warning when adding users when not logged in (could happen if OPT_AUTH isn't turned on yet 2017-03-29 10:38:29 -04:00
Isaac Connor 35067211e0 more the csrf to before actions.php 2017-03-29 10:19:00 -04:00
Isaac Connor 3cd9e46df9 Merge branch 'knnniggett-csrf' into storageareas 2017-03-28 20:44:38 -04:00
Isaac Connor d006ebfc3c Merge branch 'csrf' of https://github.com/knnniggett/ZoneMinder into knnniggett-csrf 2017-03-28 20:10:59 -04:00
Isaac Connor 769af661e9 Merge branch 'fix_x10' into storageareas 2017-03-28 20:05:52 -04:00
Isaac Connor 589b369109 fix inserting x10 record with missing , 2017-03-28 20:03:46 -04:00
Andy Bauer eb55a6bb9b set action,view, and/or request to NULL if there are not defined 2017-03-28 17:52:31 -05:00
Andy Bauer 4e16ae6d19 add ZM_ENABLE_CSRF_MAGIC toggle 2017-03-28 17:29:36 -05: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 670c1a3c7c pass NULL for ['width'] 2017-03-21 09:47:07 -04:00
Matthew Noorenberghe ea558c79a0 Fix check that API user is enabled 2017-03-20 17:16:24 -07: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
Andrew Bauer d38bae72ae integrate csrf-magic library 2017-03-18 20:12:06 -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
Andrew Bauer 7e0ac4b239 Merge pull request #1780 from connortechnology/fix_1775 
use escapeshellarg on inputs to daemonControl and other functions
 2017-03-16 09:27:04 -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