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

11714 Commits

Author SHA1 Message Date
Dmitry Smirnov dcb9999398 fix regex to match IP and first numbers of MAC in the `arp -a` output (Closes: #2144); 
fixes probing of network cameras.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2018-07-06 16:16:36 +10:00
Andrew Bauer 084f1ab1d6
Add missing reloadWebSite js function 
Somehow this went missing when the new website monitor type was merged
 2018-07-05 08:43:21 -05:00
Andrew Bauer add3682128
fix spelling 2018-07-05 08:00:24 -05:00
Isaac Connor dd479c9e55 remove () around return 2018-07-04 14:50:47 -04:00
Isaac Connor cf4a1c73fd Always us /zm in cache_bust 2018-07-04 14:46:22 -04:00
Andrew Bauer 14b83ac36b
Update zoneminder.spec 2018-07-03 16:10:06 -05:00
Andrew Bauer 61fff1cd40
Update zoneminder.spec 2018-07-03 16:08:09 -05:00
Andrew Bauer d91167e648
fix zmeditcongifdata.sh 
configdata.sh.in uses single quotes now. Update zmeditconfigdata search pattern accordingly.
 2018-07-03 15:30:11 -05:00
Andrew Bauer 32d103c216 fix submodule again 2018-07-01 08:23:00 -05:00
Andrew Bauer 5d0719f18d fixes #2137 2018-07-01 08:16:06 -05:00
Andrew Bauer 9df65e80e7
Merge pull request #2101 from connortechnology/include_fs_config_in_api_config 
Munge the config in the global configvals into the configs array
 2018-06-28 09:02:00 -05:00
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