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

3047 Commits

Author SHA1 Message Date
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 fdcb93eacc Merge branch 'master' into storageareas 2017-03-06 16:22:28 -05:00
Isaac Connor ebafc62b51 Must reopen the session so we can generate an auth hash 2017-03-01 15:27:42 -05:00
Isaac Connor 4fc0aead70 wip 2017-03-01 15:26:40 -05:00
Isaac Connor c4caa9a631 convert arguments from an array of strong to a hash and use http_build_query 2017-02-27 21:48:08 -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
Andy Bauer 8759e2bdb4 prevent divide by zero, make error messages more descriptive 2017-02-21 13:10:41 -06:00
Andy Bauer 27ca8d8674 use === operator in getDiskPercent function 2017-02-21 12:33:05 -06:00
Isaac Connor 186e5ba866 Merge branch 'master' into storageareas 2017-02-21 09:48:00 -05:00
Isaac Connor 971c70f540 Merge pull request #1793 from mnoorenberghe/api_debug_default 
Reduce the default API debug level
 2017-02-20 21:44:48 -05:00
Matthew Noorenberghe df4739826b Reduce the default API debug level 2017-02-18 23:06:53 -08:00
Manojav Sridhar f50c0e2096 fix missing isset check, caused number of Undefined Property warnings 2017-02-18 11:15:43 -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 d135216ac7 Merge branch 'master' into storageareas 2017-02-15 09:30:35 -05:00
Isaac Connor aeedfe8d74 fix some whitespacing 2017-02-14 09:11:54 -05:00
Kyle Johnson 5804cd2462 Merge pull request #2 from connortechnology/fix_sql_injection 
Sanitize input parameters
 2017-02-04 15:05:54 -07:00
Andrew Bauer c5906a5d4f Merge pull request #6 from connortechnology/log_xss_fixes2 
Log xss fixes2
 2017-02-04 16:05:43 -06:00
Kyle Johnson 6b3a53ec0f Tell PDO to use real prepared statements. 
This makes sure the statement and the values aren't
parsed by PHP before sending it to the MySQL server.

See https://stackoverflow.com/questions/60174/how-can-i-prevent-sql-injection-in-php
and https://secure.php.net/manual/en/pdo.setattribute.php
 2017-02-04 14:59:33 -07: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 cee05a1bb7 fix merge problem 2017-02-02 09:21:49 -05:00
Isaac Connor 9135da92ed fix typo fileFields => filterFields 2017-01-31 21:33:43 -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
Isaac Connor 19aed3f860 dont check ZM_DIR_EVENTS if it already exists in storageareas 2017-01-30 17:29:15 -05:00
Isaac Connor 9fd9c5de20 test for empty and non-existent path 2017-01-30 17:24:41 -05:00
Isaac Connor fda115bebe tell zmc and zma to stop before updating db 2017-01-30 16:37:53 -05:00
Isaac Connor 3437f23e8a Merge branch 'master' into fix_sql_injection 2017-01-28 14:33:49 -05:00
Isaac Connor 41dab0750e turn whatever gets output into html escaped html so that nothing gets revealed 2017-01-27 21:30:22 -05:00
Isaac Connor a8d1450adf Merge branch 'master' into fix_sql_injection 2017-01-27 17:18:34 -05:00
Kyle Johnson 746a096483 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-01-27 15:16:33 -07:00
Isaac Connor c1e05753d6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder-Pro 2017-01-27 17:12:46 -05:00
Isaac Connor 7ab6818fa0 Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize 2017-01-25 17:14:30 -05:00
Andrew Bauer dbd73690b2 use !== false rather than === true 2017-01-25 09:26:07 -06:00
Andrew Bauer 6189d2670c ZM_DIR_EVENTS can be, and often is, a symlink 2017-01-25 09:05:34 -06:00
Andrew Bauer 8b19fca992 sanitize the image path before processing 2017-01-25 08:30:19 -06:00
Isaac Connor 129acb5b8e only show mark column if you have the Monitor Edit ability 2017-01-24 09:30:56 -05:00
Isaac Connor 5b598fe90d cleanup and use cleaned up monitor_id 2017-01-23 21:51:38 -05:00
Isaac Connor 7cd2f6c69e use glyphicon for sort 2017-01-23 21:51:17 -05:00
Isaac Connor bb3d47ab45 get rid of mapping 2017-01-23 21:34:06 -05:00
Isaac Connor e937b4099b add an ajax file for console to do sorting 2017-01-23 10:13:16 -05:00