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

11703 Commits

Author SHA1 Message Date
Isaac Connor 29f0747895 Merge branch 'master' into storageareas 2018-06-25 16:15:46 -04:00
Isaac Connor e04eac57ae Include values in /etc/zm files in viewByName 2018-06-25 15:43:01 -04:00
Isaac Connor 4f0c56d731 Merge branch 'master' into include_fs_config_in_api_config 2018-06-25 15:10:52 -04:00
Isaac Connor 10531df543 Merge ../ZoneMinder.connortechnology 2018-06-25 14:51:53 -04:00
Isaac Connor 6bbd4f1083 google code style 2018-06-25 14:51:46 -04:00
Isaac Connor d271d8bf1d Fix my botched change to generateAuthHash 2018-06-25 14:50:54 -04:00
Isaac Connor e98a4b1562 Merge branch 'master' into storageareas 2018-06-25 14:31:00 -04:00
Andrew Bauer 741267bd6c
Merge pull request #2135 from connortechnology/fix_auth_hash_with_zmu 
Rework generateAuthHash to take a force parameter so that it can be u…
 2018-06-25 13:01:20 -05:00
Isaac Connor 54e7b0ac16
create ZM_EXPORT_DIR if needed (#2136) 2018-06-25 13:57:00 -04:00
Isaac Connor 99a97543f1 Rework generateAuthHash to take a force parameter so that it can be used to generate auth hashes for zmu 2018-06-25 13:43:08 -04:00
Isaac Connor c285d5ebb1 spacing. Add code to delete events that huse the deep storage scheme and have lost their symlinks. 2018-06-25 13:41:19 -04:00
Andrew Bauer 27b81bf463
rpm packaging - fedora requires php-json 2018-06-25 12:24:34 -05:00
Andrew Bauer 422d2d6dba
set telemetry default to NO 
This is the first step for GDPR compliance. A future pr will add a prompt which explains what the telemetry pr is for and whether they want to turn it on.
 2018-06-22 08:10:48 -05:00
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