mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-01 04:33:35 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,489 Commits 80 Branches 104 Tags
fd5cf07bfbbc3d4e671824946e32be3bb5d420bb
Commit Graph

11489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Connor
fd5cf07bfb Make server name and hostname full width. 2018-07-09 10:48:14 -04:00
Isaac Connor
6cf336cc33 Always use a /zm in urls to zm assets 2018-07-09 09:47:20 -04:00
Isaac Connor
4a4e845e9c Fix stupid code that defaulted minTimeSecs to 2010 instead of the first event 2018-07-08 16:24:53 -04:00
Isaac Connor
ade8d078df Define minTimeSecs and maxTimeSecs 2018-07-08 15:28:55 -04:00
Isaac Connor
d8a4acf319 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-08 15:08:54 -04:00
Isaac Connor
d257b53e82 Add missing ) to frame sql when no min/max time specified 2018-07-08 15:08:49 -04:00
Dmitry Smirnov
b5ca671103 Misc JS hygiene (#2150) 
* fixed "jquery-ui.js" symlink.

* Bootstrap source, matching minified version.

Also origin URL.

* moment.js: added missing source and URL of origin.

* video-js: replaced bad case of source-less minified binary.

 Original file was not identical to https://github.com/videojs/video.js/blob/v4.11.4/dist/video-js/video-js.min.css
 i.e. it was modified in unknown way without sources. Very bad.

* jQuery: renamed URL file for consistency

* mootools-core-compat.js: replaced original with unknown modifications; renamed; added origin URL.

* mootools-more: rename file to properly reflect version.

 This is a default build without any options.

* prism.js.FIXME: note about outdated source-less file.
 2018-07-07 10:30:16 -04:00
Andrew Bauer
f5dce7e863 Merge pull request #2145 from onlyjob/arp_regex 
fix regex to match IP and first numbers of MAC in the `arp -a` output (Closes: #2144)
 2018-07-07 08:24:47 -05:00
Andrew Bauer
015013f247 Center WEB_CONSOLE_BANNER 
Center WEB_CONSOLE_BANNER under the server stats
 2018-07-06 15:59:10 -05:00
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
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
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
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
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
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
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
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
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