2f15f1ddd5
Allow Path to be NULL
2018-06-21 15:00:25 -04:00
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -04:00
cdd3b33a41
Merge pull request #2131 from cpasqualini/wrong-encoding-lang-files
...
Change langfile's charset to UTF-8 as in #583
2018-06-20 07:57:08 -05:00
5e43cd99bc
Change langfile's charset to UTF-8 as in #583
2018-06-19 20:38:55 -03:00
50f81c50b2
Grant access to the new cache directory in Apache on Ubuntu ( #2130 )
...
This fixes a regression from #2083 and aligns with generate_apache_config.pl and the changes for Debian
2018-06-18 10:18:55 -04:00
09aa3afaac
Fix capitalisation of Ffmpeg
2018-06-16 16:47:09 -04:00
c84a08a431
Merge pull request #2125 from connortechnology/fix_2124
...
Fix #2124 . Always allow selection of checkboxes, include canEdit(Eve…
2018-06-15 14:52:08 -05:00
4fd33c2a13
Create stale.yml
2018-06-15 14:44:00 -05:00
55f2e7c6a2
Fix #2124 . Always allow selection of checkboxes, include canEdit(Events) in button disabling.
2018-06-15 15:21:10 -04:00
a48deec504
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-06-14 14:54:13 -04:00
fef88107e1
Close the db before forking in start()
2018-06-14 14:54:00 -04:00
2028012d39
Update README.Redhat7
2018-06-14 13:42:07 -05:00
f2d00b6af5
update Storage Video Writer options to only allow Passthrough for FFmpeg
2018-06-14 13:39:13 -04:00
593209edd2
turn off passthrough for remote rtsp as it doesn't work at this time.
2018-06-14 13:28:05 -04:00
a745790541
Use 1 for successful return from CaptureAndRecord
2018-06-14 13:27:46 -04:00
df682fa94e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-06-14 12:25:54 -04:00
8450d532b4
Add STDC_FORMAT_MACROS and include cinttypes so that PRIu64 works on centos7
2018-06-14 12:24:58 -04:00
d7a5940507
build system - use different output filters for arm
2018-06-14 07:16:14 -05:00
4b78d85b14
build system - additional key phrases to filter on
2018-06-13 15:56:12 -05:00
4f26301ff0
filter build output to avoid travis build failures
...
Change the way we output our build text during travis builds. This commit will strip out lines with specific keywords.
2018-06-13 15:44:31 -05:00
4190b994b2
fix ftbs on el7 - Order matters. cinttypes must be included first
2018-06-13 12:18:34 -05:00
8cc72507ee
fix ftbs on el7
2018-06-13 11:30:14 -05:00
37badbfb17
fix #2123
2018-06-12 08:58:19 -04:00
fc456b3d5f
this file is now autogenerated
2018-06-11 16:34:44 -04:00
67155e98eb
add debug message when no changes are being made to a monitor
2018-06-11 16:34:40 -04:00
73555edfdc
Add Error message when a monitor has no server assigned in a multi-server setup
2018-06-11 16:34:23 -04:00
65a5af6f92
remove extra space
2018-06-11 15:49:39 -04:00
6ad10a5b73
Correct Load to CpuLoad in Servers
2018-06-11 15:49:23 -04:00
a4ade03e6f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-06-11 14:08:19 -04:00
d1f658bf30
minor spacing changes, remove unused Server lookup
2018-06-11 14:07:49 -04:00
48f8118e5a
put back logReInit
2018-06-10 15:01:20 -04:00
578efb3a76
Need to do reaper in shutdownALl
2018-06-10 14:21:09 -04:00
982f5e2442
fix typo
2018-06-10 12:15:26 -05:00
9da5759063
Merge pull request #2117 from connortechnology/simplify_reaper
...
rework reaper
2018-06-09 20:20:07 -05:00
c7a85e37f8
rework reaper making it simply add the pid and status data into a hash of children to reap and due the reaping/restarting in the main loop.
2018-06-09 18:52:01 -04:00
f5f4649886
Fix #2100
2018-06-08 15:14:11 -04:00
524c18eb4c
Don't print to STDERR when can't log to db and recheck hasTerm on logging reinit
2018-06-08 15:13:48 -04:00
74a44869cf
Merge pull request #2116 from connortechnology/fix_perl_logging
...
when detecting a down db connection, need to clear the stored sth as …
2018-06-08 08:44:22 -05:00
d30d8efaf0
clear stored sth on initialize and re-initialize
2018-06-08 09:17:25 -04:00
7c32e4d86c
Move zmDbConnect up before logInit because the db handle got closed
2018-06-08 09:15:19 -04:00
fc0369b9a4
when detecting a down db connection, need to clear the stored sth as it is no longer valid.
2018-06-08 09:04:31 -04:00
61445620aa
create the pid file before doing anything else ( #2114 )
...
* create the pid file before doing anything else
* update comment
2018-06-08 08:53:23 -04:00
5f35f481c5
Merge pull request #2115 from connortechnology/fix_perl_logging
...
Fix perl logging
2018-06-07 18:24:23 -05:00
63ede25647
Merge branch 'fix_perl_logging' of github.com:ConnorTechnology/ZoneMinder into fix_perl_logging
2018-06-07 17:26:53 -04:00
be61c50efa
Fix setting Debug option when ZM_LOG_DEBUG_TARGET is empty and fix setting effectiveLevel
2018-06-07 17:25:02 -04:00
aa055c147b
classic skin - fix dvr control buttons
...
The buttons were being drawn too small which cropped the symbols inside the buttons. Deleting the classic-skin-specific override of the css file allows the default css to apply which looks good to me.
2018-06-07 14:32:36 -05:00
0937bfdf84
consoleTableBody needs to be an id in order for dragndrop sorting to work
2018-06-06 13:37:12 -04:00
9050ffaf92
spacing, remove some debug lines
2018-06-06 12:57:35 -04:00
cd64619743
Fix controlling daemon when the monitor is Local
2018-06-06 12:56:33 -04:00
3109536dda
Alternate fix for video generation under csrf. Now we just turn off output buffering (discarding contents before sending the avi
2018-06-06 11:55:51 -04:00
Isaac Connor
Andrew Bauer
Carlos R. Pasqualini
Matt N
Isaac Connor
Isaac Connor