Isaac Connor
|
271848a06f
|
clean up rebase
|
2018-06-21 21:42:51 -04:00 |
|
Isaac Connor
|
24ceb75936
|
Merge branch 'master' into include_fs_config_in_api_config
|
2018-06-21 21:41:54 -04:00 |
Isaac Connor
|
2f15f1ddd5
|
Allow Path to be NULL
|
2018-06-21 15:00:25 -04:00 |
|
Isaac Connor
|
fd72689182
|
Spacing, quotes. Main thing is to delete Object cache on HUP
|
2018-06-21 10:49:51 -04:00 |
|
Isaac Connor
|
3cb5ef6a94
|
Spacing
|
2018-06-21 10:00:54 -04:00 |
Andrew Bauer
|
3ffd30ffbd
|
Allow selection of different source column filtering on the console (#2132)
|
2018-06-20 11:12:43 -04:00 |
|
Andrew Bauer
|
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 |
Carlos R. Pasqualini
|
5e43cd99bc
|
Change langfile's charset to UTF-8 as in #583
|
2018-06-19 20:38:55 -03:00 |
Matt N
|
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 |
|
Isaac Connor
|
b0411cbfd2
|
Merge branch 'master' into storageareas
|
2018-06-16 16:47:53 -04:00 |
|
Isaac Connor
|
09aa3afaac
|
Fix capitalisation of Ffmpeg
|
2018-06-16 16:47:09 -04:00 |
|
Andrew Bauer
|
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 |
|
Andrew Bauer
|
4fd33c2a13
|
Create stale.yml
|
2018-06-15 14:44:00 -05:00 |
|
Isaac Connor
|
55f2e7c6a2
|
Fix #2124. Always allow selection of checkboxes, include canEdit(Events) in button disabling.
|
2018-06-15 15:21:10 -04:00 |
|
Isaac Connor
|
ea86cb1181
|
Add debugging line to try to figure out starttime in the future problem
|
2018-06-15 10:16:28 -04:00 |
|
Isaac Connor
|
a594a1b6f1
|
Merge branch 'master' into storageareas
|
2018-06-15 09:45:11 -04:00 |
|
Isaac Connor
|
a48deec504
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-06-14 14:54:13 -04:00 |
|
Isaac Connor
|
fef88107e1
|
Close the db before forking in start()
|
2018-06-14 14:54:00 -04:00 |
|
Andrew Bauer
|
2028012d39
|
Update README.Redhat7
|
2018-06-14 13:42:07 -05:00 |
Isaac Connor
|
f2d00b6af5
|
update Storage Video Writer options to only allow Passthrough for FFmpeg
|
2018-06-14 13:39:13 -04:00 |
|
Isaac Connor
|
7520d20751
|
update Storage Video Writer options to only allow Passthrough for FFmpeg
|
2018-06-14 13:36:32 -04:00 |
|
Isaac Connor
|
593209edd2
|
turn off passthrough for remote rtsp as it doesn't work at this time.
|
2018-06-14 13:28:05 -04:00 |
|
Isaac Connor
|
a745790541
|
Use 1 for successful return from CaptureAndRecord
|
2018-06-14 13:27:46 -04:00 |
|
Isaac Connor
|
df682fa94e
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-06-14 12:25:54 -04:00 |
|
Isaac Connor
|
8450d532b4
|
Add STDC_FORMAT_MACROS and include cinttypes so that PRIu64 works on centos7
|
2018-06-14 12:24:58 -04:00 |
|
Andrew Bauer
|
d7a5940507
|
build system - use different output filters for arm
|
2018-06-14 07:16:14 -05:00 |
|
Andrew Bauer
|
4b78d85b14
|
build system - additional key phrases to filter on
|
2018-06-13 15:56:12 -05:00 |
|
Andrew Bauer
|
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 |
|
Andrew Bauer
|
4190b994b2
|
fix ftbs on el7 - Order matters. cinttypes must be included first
|
2018-06-13 12:18:34 -05:00 |
|
Andrew Bauer
|
8cc72507ee
|
fix ftbs on el7
|
2018-06-13 11:30:14 -05:00 |
|
Isaac Connor
|
37badbfb17
|
fix #2123
|
2018-06-12 08:58:19 -04:00 |
|
Isaac Connor
|
fc456b3d5f
|
this file is now autogenerated
|
2018-06-11 16:34:44 -04:00 |
|
Isaac Connor
|
67155e98eb
|
add debug message when no changes are being made to a monitor
|
2018-06-11 16:34:40 -04:00 |
|
Isaac Connor
|
73555edfdc
|
Add Error message when a monitor has no server assigned in a multi-server setup
|
2018-06-11 16:34:23 -04:00 |
|
Isaac Connor
|
65a5af6f92
|
remove extra space
|
2018-06-11 15:49:39 -04:00 |
|
Isaac Connor
|
6ad10a5b73
|
Correct Load to CpuLoad in Servers
|
2018-06-11 15:49:23 -04:00 |
|
Isaac Connor
|
a4ade03e6f
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-06-11 14:08:19 -04:00 |
|
Isaac Connor
|
d1f658bf30
|
minor spacing changes, remove unused Server lookup
|
2018-06-11 14:07:49 -04:00 |
|
Isaac Connor
|
48f8118e5a
|
put back logReInit
|
2018-06-10 15:01:20 -04:00 |
|
Isaac Connor
|
578efb3a76
|
Need to do reaper in shutdownALl
|
2018-06-10 14:21:09 -04:00 |
|
Andrew Bauer
|
982f5e2442
|
fix typo
|
2018-06-10 12:15:26 -05:00 |
|
Andrew Bauer
|
9da5759063
|
Merge pull request #2117 from connortechnology/simplify_reaper
rework reaper
|
2018-06-09 20:20:07 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
f5f4649886
|
Fix #2100
|
2018-06-08 15:14:11 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
be26f14566
|
put back zmsystemctl.pl
|
2018-06-08 14:59:14 -04:00 |
|
Isaac Connor
|
374123f9c2
|
get rid of debugging and turn of extra logReInit
|
2018-06-08 14:21:27 -04:00 |
|
Isaac Connor
|
5cdbc85dcc
|
Slightly more efficient logPrint. Don't create the message string unless it is going to be used
|
2018-06-08 14:18:38 -04:00 |
|
Andrew Bauer
|
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 |
|
Isaac Connor
|
d589d31f74
|
Merge branch 'master' into storageareas
|
2018-06-08 09:30:21 -04:00 |