Andrew Bauer
b4f77077e9
Update zmdc.pl.in
...
temporary fix to #2292
2018-11-16 18:33:54 -06:00
Andrew Bauer
21d311942f
Create no-response.yml
2018-11-16 17:54:24 -06:00
Andrew Bauer
15e720d4f7
Create config.yml
2018-11-16 17:50:54 -06:00
Andrew Bauer
6883d5b532
Update ISSUE_TEMPLATE.md
2018-11-16 17:11:05 -06:00
Andrew Bauer
713e810632
Update ISSUE_TEMPLATE.md
2018-11-16 17:08:23 -06:00
Andrew Bauer
b353b625eb
rpm - configure the nginx config file in all cases
2018-11-16 10:40:39 -06:00
Andrew Bauer
8df9e4c1ee
Update zoneminder.logrotate.in
2018-11-15 20:18:56 -06:00
Andrew Bauer
e5f2212a32
fix gpl mailing address
2018-11-15 20:00:53 -06:00
Andrew Bauer
5c2e5d89ed
fix gpl mailing address
...
This makes rpmlint & lintian complain less
2018-11-15 19:53:45 -06:00
Isaac Connor
d99ee73ad3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-15 12:24:04 -05:00
Isaac Connor
415d43fafb
Include Server Name when testing for CORS. Also be case insensitive.
2018-11-15 12:23:52 -05:00
Isaac Connor
f72651da5a
Add auth hash to ajax fps and status calls in zone edit
2018-11-15 12:22:35 -05:00
Andrew Bauer
9b46c92ac5
rpm pkg - add note to zm php-fpm config file
2018-11-15 09:19:26 -06:00
Andrew Bauer
2f8c0654d5
rpm pkg - fix for zm php-fpm config path
2018-11-15 08:31:04 -06:00
Andrew Bauer
f2fc234880
rpm pkg - install zm php-fpm config in all cases for future nginx support
2018-11-15 08:26:54 -06:00
Isaac Connor
70d9fda758
Implement a logging callback for avcodec to use our logging functions
2018-11-14 17:02:52 -05:00
Isaac Connor
aa8ac9c31c
spaces and quotes
2018-11-14 15:54:45 -05:00
Isaac Connor
3a409b26aa
Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons
2018-11-14 15:54:34 -05:00
Isaac Connor
3be31020b7
Automatically add width to frames view when thumbnails are turned on.
2018-11-14 15:54:01 -05:00
Isaac Connor
490fb40917
DefaultView in the past was used to control whether the watch view starts up with ptz controls visible or the events list. Isaac changed the watch view to always have the controls visible... so this setting is no longer useful.
2018-11-14 09:22:38 -05:00
Isaac Connor
35b439629c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-13 18:14:35 -05:00
Isaac Connor
5120c6f540
remove compile warning by assigning AV_CODEC_NONE to the codec_id.
2018-11-13 18:13:55 -05:00
Andrew Bauer
8b50c87aab
Merge pull request #2307 from connortechnology/fix_32bit_alignment
...
remove epadding2, to restore the 64bit alignment of startup_time.
2018-11-13 13:38:53 -06:00
Isaac Connor
ca87936cd7
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
2018-11-13 14:13:41 -05:00
Isaac Connor
798bf68df1
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
2018-11-13 14:13:32 -05:00
Isaac Connor
31b0ed107d
remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258
2018-11-13 14:02:44 -05:00
Isaac Connor
07d6d799ce
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-13 10:30:58 -05:00
Isaac Connor
993da131f1
tidy up and use Error instead of Carp::croak
2018-11-13 10:29:19 -05:00
Isaac Connor
abeafe9ba6
fix log export. minTime and maxTime were being cleared by the regexp to detect sub second time. Also use ZM_DIR_EXPORTS instead of ZM_PATH_SWAP
2018-11-12 15:43:03 -05:00
Isaac Connor
d76d6bb9d1
include overlay.js when viewing the log, so that export works
2018-11-12 15:09:15 -05:00
Pliable Pixels
e06f5b0f90
removed static
2018-11-12 13:34:29 -05:00
Pliable Pixels
01a57222d3
keep track if we have written alarmed frame incase savejpeg is off
2018-11-12 12:43:20 -05:00
Isaac Connor
2cc9c6bab1
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-12 11:56:30 -05:00
Isaac Connor
a95a012fa5
fix #2302
2018-11-12 11:56:18 -05:00
rafidashab
4a56a405b7
Fix typos in README file ( #2301 )
...
* Fix typos in README file
* Improve clarity in introduction doc
* Improved word selection
* Revision of the README file
* Finish editing introduction documentation
2018-11-12 09:18:13 -05:00
Isaac Connor
246765ced9
Add tooltip for sorting monitors
2018-11-11 16:23:19 -05:00
Isaac Connor
967fe14b22
Add ability to update incorrect starttime.
2018-11-11 10:17:32 -05:00
Isaac Connor
1e98ecb595
Sort keys in to_string
2018-11-09 12:14:39 -05:00
Isaac Connor
5f81e9111f
Add Scheme and SaveJPEGs to Event fields, and fix setting Scheme
2018-11-09 12:14:05 -05:00
Isaac Connor
abada5c95c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-09 10:47:00 -05:00
Isaac Connor
4ddd328c61
Check and Fix Scheme and StorageArea
2018-11-09 10:39:57 -05:00
Aktarus
1844a7eb29
Update definemonitor.rst ( #2299 )
2018-11-09 07:59:06 -05:00
Andrew Bauer
d6877b763d
Merge pull request #2298 from connortechnology/log_use_global_dbh
...
Use the global dbh in ZoneMinder::Database instead of keeping our own…
2018-11-07 12:29:11 -06:00
Isaac Connor
82abd04f36
Add type=button to buttons so they don't act like submit buttons
2018-11-07 13:19:42 -05:00
Isaac Connor
ec09a71ba0
Include defaults for all the missing Monitor Columns
2018-11-07 13:18:53 -05:00
Isaac Connor
702143e51b
Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top.
...
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.
This is a pretty quick, crude implementation.
2018-11-07 12:33:54 -05:00
Isaac Connor
a066968aca
fix dbError and cause it to return the error string instead of just logging it. Add error logging of db errors that don't throw exceptions.
2018-11-07 12:33:18 -05:00
Isaac Connor
230ce61dc4
fix #2296 by prepending bind with ::
2018-11-07 11:54:18 -05:00
Isaac Connor
0e3eb0df17
remove extra quotes, google code style, update pod docs
2018-11-07 11:26:48 -05:00
Isaac Connor
4107082845
Don't delete default states if there are none
2018-11-07 11:01:49 -05:00