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

14854 Commits

Author SHA1 Message Date
Isaac Connor 3db8490d9c Escape another case of Function for mysql8 2020-09-25 10:59:31 -04:00
Isaac Connor f4f02e24bd Use /run/zm instead of /var/run/zm 2020-09-25 09:48:56 -04:00
Joseph Yasi 52ca2abf69 Quote some more MySQL8 Reserved keywords 
See:
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295/comments/1
https://github.com/ZoneMinder/zoneminder/issues/2659
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
 2020-09-25 09:37:21 -04:00
Isaac Connor 32e0c92747 After adding SaveJPEGs to Events, need to populate them with SaveJPegs from MOnitors 2020-09-24 13:43:05 -04:00
Isaac Connor 2457dcb16f Minimum value for label position is 0, not 1. 2020-09-22 13:12:39 -04:00
Isaac Connor 2f03ceeccf log referer when unable to authenticate 2020-09-22 13:10:39 -04:00
Isaac Connor a43cbc05af Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output 2020-09-21 13:03:03 -04:00
Isaac Connor e2502f49e9 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-19 12:00:36 -04:00
Isaac Connor 3492582b98 add missing css for settings popup 2020-09-19 12:00:32 -04:00
Isaac Connor 17369e73e2 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-16 15:30:05 -04:00
Isaac Connor f86e83b4c4 Indicate default action 2020-09-16 15:29:42 -04:00
Isaac Connor 89913adfa3 Bump version to 1.34.21 for release 2020-09-16 14:23:23 -04:00
Isaac Connor 6b2773ad8c Handle invalid eid more gracefully. 2020-09-16 14:21:03 -04:00
Isaac Connor 9268db14a7 Fix xss reported by Noccolo Picca relating to not sanitizing connkey 2020-09-16 14:14:31 -04:00
Isaac Connor 147238027c Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-16 09:59:28 -04:00
Pliable Pixels 8ad62b8905 another try at fixing Eventcontroller 2020-09-13 16:43:49 -04:00
Isaac Connor 2cd9c8e232 Update api Zone Saving. Fixes #3037 2020-09-10 13:32:15 -04:00
Isaac Connor b428cd3ef5 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-07 10:21:10 -04:00
Isaac Connor 3b1be3346b escape table name when updating Objects 2020-09-07 10:21:06 -04:00
Isaac Connor 74d2ba56db Persist video volume in a cookie so that subsequent events remember the volume level. 2020-08-26 15:15:10 -04:00
Isaac Connor b5ef7b08b9 settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth. 2020-08-25 12:40:22 -04:00
Isaac Connor 6587cdd3de Handle failure to get v4l settings. Fix assignment of values to monitor object. 2020-08-25 12:39:44 -04:00
Isaac Connor b0f5f3617a Always set auth_hash and always set auth_relay, using our handy new get_auth_relay function 2020-08-25 12:39:14 -04:00
Isaac Connor f1fab6361f fix dimensions of v4l settings popup 2020-08-25 12:38:46 -04:00
Isaac Connor 98dce06d6b Introduce get_auth_relay to return an auth string to use in urls. 2020-08-25 12:38:31 -04:00
Isaac Connor 3c29228df5 Use zm_session_start 2020-08-25 11:30:22 -04:00
Isaac Connor 586f9f3e52 Use zm_session_start 2020-08-25 11:27:25 -04:00
Isaac Connor 977dee29f1 bump for release 1.34.20 2020-08-23 11:48:00 -04:00
Isaac Connor cf63cc65c8 eoan is deprecated. 2020-08-23 11:42:08 -04:00
Isaac Connor c2d6b8f493 revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors. 2020-08-19 14:39:15 -04:00
Isaac Connor d0c21995cd Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-19 14:14:32 -04:00
Isaac Connor efec1e7d4f remove debug 2020-08-19 14:13:48 -04:00
Isaac Connor 177df46113 Apply min=0 to filterX and Y so that we don't get negative values 2020-08-19 14:11:16 -04:00
Isaac Connor 16efa9dbb2 Add extra checks for Deleting without an Archived State term and Running in the background without any actions. 2020-08-18 11:17:22 -04:00
Isaac Connor 768c746944 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-08-18 09:00:20 -04:00
Isaac Connor 4c69d7b748
Merge pull request #3001 from connortechnology/update_users_controller 
Update permissions checking when viewing/editing users.  Fixes #2982.…
 2020-08-18 09:00:07 -04:00
Isaac Connor a92a16f13e Merge branch 'update_users_controller' into release-1.34 2020-08-17 19:33:31 -04:00
Isaac Connor 57b4d2b278 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-08-17 19:29:07 -04:00
Isaac Connor e5dda8d142 Include avutils/imgutils.h to support compile on libav-tools 2020-08-16 14:56:52 -04:00
Isaac Connor c87886f5a5 Fix v4l2 channel and palette dropdowns allowing the saving of local monitors. 2020-08-15 12:31:30 -04:00
Isaac Connor 19fff95079 Remove default from LabelFormat 2020-08-11 17:31:32 -04:00
Isaac Connor 56fbfa0dd2 Add db update to drop default value for LabelFormat. Fixes #2896 2020-08-11 14:14:16 -04:00
Isaac Connor 6918461c3e Bump version to 1.34.19 for release 2020-08-11 11:03:20 -04:00
Isaac Connor afae319c94 Fix MOCORD not going into ALARM state. 2020-08-11 11:02:26 -04:00
Isaac Connor 12dbd267bf Add devuan beowulf support 2020-08-11 09:21:48 -04:00
Isaac Connor 81b55589db Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent. 2020-08-10 13:59:47 -04:00
Isaac Connor bafffdb486 Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message 2020-08-10 12:26:37 -04:00
Isaac Connor 1ea36e3ee6 populate ZM_PATH_SHUTDOWN 2020-08-10 12:26:26 -04:00
Isaac Connor b4a3ccdfed only put the hostname in the CSP headers so that we accept as source either http or https or any port. Useful for multiport. 2020-08-09 22:18:07 -04:00
Isaac Connor a001c93321 fix zone editing globals and inputs being too big 2020-08-08 11:41:24 -04:00