Isaac Connor
|
600dbba8c5
|
We don't need to set date_default_timezone_get
|
2020-02-11 13:23:53 -05:00 |
|
Isaac Connor
|
821355c117
|
Only set date.timezone if we have a configured value in the Config
|
2020-02-11 13:21:28 -05:00 |
|
Isaac Connor
|
ac8c7a9347
|
default ZM_TIMEZONE value to empty in which case we don't set the value
|
2020-02-11 13:21:02 -05:00 |
Isaac Connor
|
3717e6b702
|
Merge pull request #2830 from connortechnology/fix_zms_mp4_rotation
Fix zms mp4 rotation
|
2020-02-10 16:41:34 -05:00 |
|
Isaac Connor
|
4f25426b1f
|
load event orientation as well and if it's an mp4 do the rotation on the image before outputting. Fixes #2829
|
2020-02-10 16:22:01 -05:00 |
|
Isaac Connor
|
137bdb1f24
|
Make shm have error or warning class if full
|
2020-02-10 14:20:46 -05:00 |
|
Isaac Connor
|
1add4b2ef5
|
Merge pull request #2828 from connortechnology/fix_2825
Fix 2825
|
2020-02-09 13:56:16 -05:00 |
|
Isaac Connor
|
3b30d0a8db
|
code restructure, return all valid profiles instead of just the first one. Also add multicase stream types. This incorporates ideas from patch from remi-crypto. Fixes #2825
|
2020-02-09 13:51:36 -05:00 |
|
Isaac Connor
|
466468b0fd
|
code style cleanups and uncomment get_service_urls call in create_services so that we actually parse the ONVIF response.
|
2020-02-09 13:50:22 -05:00 |
Andrew Bauer
|
4d82a5485a
|
rpm specfile
I have to use my contact info for rpmfusion
|
2020-02-08 10:46:54 -06:00 |
|
Isaac Connor
|
4479029e27
|
When doing a release, reploy to debian/release-VERSION instead of master.
|
2020-02-06 14:46:26 -05:00 |
|
Isaac Connor
|
83411cd6f2
|
fix zmrepo dest dir when doing a proper release
|
2020-02-06 14:45:38 -05:00 |
|
Isaac Connor
|
389a6b3ec8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-06 13:22:30 -05:00 |
|
Isaac Connor
|
c465fa55d8
|
Use ZM_PATH_FFMPEG instead of ffmpeg
|
2020-02-06 13:22:22 -05:00 |
|
Isaac Connor
|
1cbc75813c
|
improve the output of the ajaxError to say what the action was and who the user was
|
2020-02-06 13:21:57 -05:00 |
|
Isaac Connor
|
dd0ce50c17
|
quotes and improve the output of the ajaxError to say what the action was and who the user was
|
2020-02-06 13:21:30 -05:00 |
|
Isaac Connor
|
e8a0ed9208
|
quotes and improve the output of the ajaxError to say what the action was and who the user was
|
2020-02-06 13:20:35 -05:00 |
|
Isaac Connor
|
0e098df972
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-04 16:53:50 -05:00 |
|
Isaac Connor
|
87c4227f8d
|
Merge pull request #2823 from connortechnology/fix_recaptcha
Fix recaptcha
|
2020-02-04 16:48:11 -05:00 |
|
Isaac Connor
|
b7ad7ab1fc
|
release 1.34.2
|
2020-02-04 16:47:39 -05:00 |
|
Isaac Connor
|
af6b51f0d3
|
release 1.34.2
|
2020-02-04 16:47:33 -05:00 |
|
Isaac Connor
|
1c2f2657d2
|
We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha
|
2020-02-04 16:41:19 -05:00 |
|
Isaac Connor
|
42b3bb6a53
|
increase width of google sitekey and secret key inputs to 100%
|
2020-02-04 16:40:52 -05:00 |
|
Andrew Bauer
|
9a71ca9a2f
|
update specfile changelog
|
2020-01-31 19:25:35 -06:00 |
|
Isaac Connor
|
482577f8e4
|
Merge branch 'release-1.34'
|
2020-01-31 08:14:20 -05:00 |
|
Andrew Bauer
|
ac5a7e7717
|
Merge pull request #2818 from firefly2442/firefly2442-patch-1
fix spelling
|
2020-01-29 07:03:22 -06:00 |
Patrick
|
c5b419976f
|
fix spelling
|
2020-01-28 20:22:18 -07:00 |
|
Isaac Connor
|
fb5111ffe4
|
bump version to 1.34.1 for release
|
2020-01-24 17:01:47 -05:00 |
|
Isaac Connor
|
52dfbc92e9
|
put back operator filtering in parseRows. Do it for all attrs. Fix Zone name in AlarmedZoneId attr
|
2020-01-24 11:10:02 -05:00 |
|
Isaac Connor
|
df5bf788d9
|
Filtering by Alarmed Zone now only supports a single value using EXISTS as the operator. We now also support CURDATE() and NOW() as values for Date/StartDate/EndDate
|
2020-01-24 11:09:27 -05:00 |
|
Isaac Connor
|
29a04dc1b9
|
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
|
2020-01-24 09:50:53 -05:00 |
|
Isaac Connor
|
adf376e4a6
|
add Zone.php
|
2020-01-24 09:45:02 -05:00 |
|
Isaac Connor
|
6345ecc479
|
remove debug
|
2020-01-23 17:04:33 -05:00 |
|
Isaac Connor
|
b3b1c38e9c
|
update Filter Email subsitution documentation
|
2020-01-22 17:37:12 -05:00 |
|
Isaac Connor
|
948b3d7e43
|
Impleent click_AutoEmail to hide/show the Email options
|
2020-01-22 17:02:16 -05:00 |
|
Isaac Connor
|
d95857d419
|
Add EmailTo,EmailSubject,EmailBody fields to filter view
|
2020-01-22 14:05:08 -05:00 |
|
Isaac Connor
|
8aa0fe665f
|
Add EmailTo,EmailSubjecet,EmailBody fields to Filter object
|
2020-01-22 14:04:42 -05:00 |
|
Isaac Connor
|
f4b5f5f399
|
style the new Email content fields
|
2020-01-22 14:04:23 -05:00 |
|
Isaac Connor
|
dac76e0328
|
add language subs for FilterEmailTo, FilterEmailSubject, FilterEmailBody
|
2020-01-22 13:59:12 -05:00 |
|
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 |