Isaac Connor
a26ab59c30
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-10 11:01:47 -04:00
Isaac Connor
831fe57025
Spacing and google code style
2018-07-10 11:00:52 -04:00
Isaac Connor
7fb12171a3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-10 10:31:54 -04:00
Isaac Connor
77fbfccee0
fix #2149
2018-07-10 10:31:43 -04:00
Dmitry Smirnov
756369f2d8
JSON::Any --> JSON::MaybeXS ( Closes : #770 ). ( #2151 )
2018-07-10 10:27:03 -04:00
Isaac Connor
8db6561030
Add missing ;
2018-07-09 13:08:20 -04:00
Isaac Connor
974e42a610
spacing
2018-07-09 13:07:49 -04:00
Isaac Connor
3ecf0055b5
spacing
2018-07-09 13:07:16 -04:00
Isaac Connor
0824f740ae
Make video 100% width in cycle. Also fix monitors filtering by putting it in a form
2018-07-09 12:50:57 -04:00
Isaac Connor
65564fa480
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-09 12:39:08 -04:00
Isaac Connor
12a673169f
spacing
2018-07-09 12:33:37 -04:00
Isaac Connor
ba8dc2059d
spacing
2018-07-09 12:33:21 -04:00
Isaac Connor
afa31842b5
spacing
2018-07-09 12:28:39 -04:00
Isaac Connor
9561401a44
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-09 12:02:14 -04:00
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
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