d8a4acf319
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-08 15:08:54 -04:00
d257b53e82
Add missing ) to frame sql when no min/max time specified
2018-07-08 15:08:49 -04:00
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
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
015013f247
Center WEB_CONSOLE_BANNER
...
Center WEB_CONSOLE_BANNER under the server stats
2018-07-06 15:59:10 -05:00
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
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
add3682128
fix spelling
2018-07-05 08:00:24 -05:00
dd479c9e55
remove () around return
2018-07-04 14:50:47 -04:00
cf4a1c73fd
Always us /zm in cache_bust
2018-07-04 14:46:22 -04:00
14b83ac36b
Update zoneminder.spec
2018-07-03 16:10:06 -05:00
61fff1cd40
Update zoneminder.spec
2018-07-03 16:08:09 -05:00
d91167e648
fix zmeditcongifdata.sh
...
configdata.sh.in uses single quotes now. Update zmeditconfigdata search pattern accordingly.
2018-07-03 15:30:11 -05:00
32d103c216
fix submodule again
2018-07-01 08:23:00 -05:00
5d0719f18d
fixes #2137
2018-07-01 08:16:06 -05:00
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
29f0747895
Merge branch 'master' into storageareas
2018-06-25 16:15:46 -04:00
e04eac57ae
Include values in /etc/zm files in viewByName
2018-06-25 15:43:01 -04:00
4f0c56d731
Merge branch 'master' into include_fs_config_in_api_config
2018-06-25 15:10:52 -04:00
10531df543
Merge ../ZoneMinder.connortechnology
2018-06-25 14:51:53 -04:00
6bbd4f1083
google code style
2018-06-25 14:51:46 -04:00
d271d8bf1d
Fix my botched change to generateAuthHash
2018-06-25 14:50:54 -04:00
e98a4b1562
Merge branch 'master' into storageareas
2018-06-25 14:31:00 -04:00
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
54e7b0ac16
create ZM_EXPORT_DIR if needed ( #2136 )
2018-06-25 13:57:00 -04:00
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
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
27b81bf463
rpm packaging - fedora requires php-json
2018-06-25 12:24:34 -05:00
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
271848a06f
clean up rebase
2018-06-21 21:42:51 -04:00
24ceb75936
Merge branch 'master' into include_fs_config_in_api_config
2018-06-21 21:41:54 -04:00
2f15f1ddd5
Allow Path to be NULL
2018-06-21 15:00:25 -04:00
fd72689182
Spacing, quotes. Main thing is to delete Object cache on HUP
2018-06-21 10:49:51 -04:00
3cb5ef6a94
Spacing
2018-06-21 10:00:54 -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
b0411cbfd2
Merge branch 'master' into storageareas
2018-06-16 16:47:53 -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
ea86cb1181
Add debugging line to try to figure out starttime in the future problem
2018-06-15 10:16:28 -04:00
a594a1b6f1
Merge branch 'master' into storageareas
2018-06-15 09:45:11 -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
7520d20751
update Storage Video Writer options to only allow Passthrough for FFmpeg
2018-06-14 13:36:32 -04:00
Isaac Connor
Dmitry Smirnov
Andrew Bauer
Andrew Bauer
Isaac Connor
Carlos R. Pasqualini
Matt N
Isaac Connor