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

14838 Commits

Author SHA1 Message Date
Isaac Connor edf5066d84 Use Filter fields instead of config entries for Email content, subject, To. Also change the meaning of EPI1 and EPIM. Before they replaced with the url to the frame view. Now they are the url to the image view so that we can use them to embed images directly in the email. The old behaviour has been moved to EPF1 and EPFM. A similar change was made to EIMOD. 2020-01-22 13:58:44 -05:00
Isaac Connor 8f2aeca0d7 Hide EMAIL_TO, EMAIL_BODY, EMAIL_SUBJECT config entries as they are in the Filter object now 2020-01-22 13:55:49 -05:00
Isaac Connor 259530fd3d Add EmailTo,EmailSubject,EmailBody fields to Filter 2020-01-22 13:52:05 -05:00
Isaac Connor 9d41334e8f Merge branch 'master' into add_alarmed_zone_to_filters 2020-01-22 13:45:37 -05:00
Isaac Connor 8e604afb58 actually copy *.buildinfo when deploying 2020-01-21 17:21:43 -05:00
Isaac Connor daa2f1bab6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-21 16:53:53 -05:00
Isaac Connor a9ed5c1158 escape column names for mysql8. Fixes #2814 2020-01-21 16:53:43 -05:00
Isaac Connor 5f4dd319d1
Merge pull request #2813 from connortechnology/redirect_after_Login 
Instead of passing query string in form post variables, store it in s…
 2020-01-20 11:35:09 -05:00
Isaac Connor dbdb13efd7 Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811 2020-01-20 11:02:43 -05:00
Isaac Connor e53ec9c8b9
Merge pull request #2812 from ggscott/montage_mpvar_fix 
Bug fix Montage page: Allows for proper functionality if MultiPort isn't configured
 2020-01-20 10:26:16 -05:00
Garrett Scott ead52f30b1 Bug fix: Allows for inital/base install without the option MultiPort config value assigned 2020-01-20 00:44:20 -08:00
Isaac Connor 75fa1d693d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-18 16:09:44 -05:00
Isaac Connor a3754709e4 allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it. 2020-01-18 16:09:33 -05:00
Isaac Connor 6c7f003198 revert bogus change not including skin.js 2020-01-18 16:08:55 -05:00
Andrew Bauer 0992928089 merge rpm changelog from RPMFusion 2020-01-18 11:00:00 -06:00
Andrew Bauer de5bf21d8a
fix eslint 2020-01-17 15:06:46 -06:00
Isaac Connor 5b8e5eb349 don't output duplicated js when css=base 2020-01-17 14:51:02 -05:00
Isaac Connor d0003215b1 Merge branch 'master' into rate_dropdown 2020-01-17 12:30:35 -05:00
Isaac Connor 86a2523498 break up a long line, add some parenthesis to clarify logic 2020-01-17 12:30:26 -05:00
Isaac Connor a398f33e68 fix delTerm button not being enabled because it is a button now, not an input 2020-01-17 09:17:29 -05:00
Isaac Connor 4f2df830a8 fix inline js 2020-01-17 09:17:05 -05:00
Isaac Connor 74b3ad6dd9 add options help for HWACCEL options 2020-01-16 14:33:37 -05:00
Isaac Connor 6a43c2deb5 fix zoom_range to zoomout_range 2020-01-16 14:17:40 -05:00
Isaac Connor 028e7e8dde Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-15 19:03:11 -05:00
Isaac Connor 09f2298838 return empty array instead of nothing in probeNetwork 2020-01-15 19:02:40 -05:00
Isaac Connor d4bc0bf72b bump version for release to 1.34.0 2020-01-15 17:31:06 -05:00
Isaac Connor f5ce39ae24
Merge pull request #2809 from gonzalezcalleja/master 
Avoid duplicate monitors in API
Fixes #2797
 2020-01-15 16:14:43 -05:00
Javier Gonzalez 8b375de455 Avoid duplicate Monitors in API 2020-01-15 20:31:05 +01:00
Javier Gonzalez c10836003d Merge remote-tracking branch 'upstream/master' 2020-01-15 20:28:52 +01:00
Isaac Connor 02e9096d2b When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code 2020-01-13 17:32:57 -05:00
Isaac Connor e4ba1fd432 fix restarting zmcontrol on remote servers by passing object=filter as well 2020-01-13 17:16:15 -05:00
Isaac Connor d7dc7cdc47 Add ServerId to database log entries in php 2020-01-13 16:18:01 -05:00
Isaac Connor 9036b6db77 fix typo 2020-01-13 16:17:39 -05:00
Isaac Connor f3a9e608db Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-13 16:11:19 -05:00
Isaac Connor 91acb775eb Fix Eventount to EventCount 2020-01-13 13:43:14 -05:00
Isaac Connor b11815cfa9 Introduce Storage->EventCount to get the # of events per storage without actually loading all events. 2020-01-13 12:53:50 -05:00
Isaac Connor 6cd76ee2ff Clear cache after loading Events so as to free ram. 2020-01-13 12:53:05 -05:00
Isaac Connor 9525268192 Wait 5 seconds instead of 1 after failure to connect. Reduces error logs filling up db. 2020-01-13 12:52:34 -05:00
Isaac Connor 0afcbe626c remove redundant logging line. Connect() will do the logging 2020-01-13 12:51:30 -05:00
Isaac Connor 7acda5818a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-13 10:58:07 -05:00
Isaac Connor f7e2359818 Implement a clear_cache function so that we can free up cached objects 2020-01-13 10:57:56 -05:00
Isaac Connor f6d10e84f2 Fix basic auth. TUrn ControlAddress into a URI if it isn't one 2020-01-12 18:07:20 -05:00
Isaac Connor 8dfe7460f3 revert bogus change 2020-01-11 10:21:29 -05:00
Isaac Connor 398688550b fixtypo 2020-01-10 20:15:52 -05:00
Isaac Connor fabb7180d6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-10 20:13:28 -05:00
Isaac Connor 0c478c7962 fix Monitor->Server 2020-01-10 20:13:09 -05:00
Isaac Connor 6bafd4b130
Merge pull request #2804 from PrplHaz4/patch-2 
add 3840x2160 4k UHD to monitor dropdown
 2020-01-10 20:07:24 -05:00
PrplHaz4 6a4b66a792
add 3840x2160 4k UHD to monitor dropdown 
I think this is fairly common in consumer IP cams now...
 2020-01-10 19:44:06 -05:00
Isaac Connor 9b2a5b2261 Add table column definitions so we can use perl code to actually create or update monitors 2020-01-10 19:06:34 -05:00
Isaac Connor 2f5caf2bb5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-10 17:21:10 -05:00