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

4500 Commits

Author SHA1 Message Date
Pliable Pixels 8afb3d8650
formatting 2018-09-26 10:05:54 -04:00
Pliable Pixels f1db5446d1
added license 2018-09-26 10:02:39 -04:00
Isaac Connor 21438d17ac Fix authenticating User 2018-07-10 13:19:51 -04:00
Isaac Connor 930d929427 Merge branch 'storageareas' into api_auth 2018-07-10 12:46:30 -04:00
Isaac Connor d9f5d5fe4c Merge branch 'master' into storageareas 2018-07-10 12:46:09 -04:00
Isaac Connor e6a9422636 Add entry for StorageArea 2018-07-10 12:26:25 -04:00
Isaac Connor a0992baa16 Add entry for SignalCheckPoints 2018-07-10 12:25:36 -04:00
Isaac Connor d05ad12b48 We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148 2018-07-10 11:54:30 -04:00
Isaac Connor 46a496aefa rework monitorprobe to be more logical, and not use Fatal. 2018-07-10 11:54:16 -04:00
Isaac Connor 7ed316d3a5 We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148 2018-07-10 11:49:45 -04:00
Isaac Connor 13055bdda6 rework monitorprobe to be more logical, and not use Fatal. 2018-07-10 11:49:02 -04:00
Isaac Connor d3034670a0 Merge branch 'master' into storageareas 2018-07-10 11:03:33 -04:00
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 77fbfccee0 fix #2149 2018-07-10 10:31:43 -04:00
Isaac Connor 8db6561030 Add missing ; 2018-07-09 13:08:20 -04:00
Isaac Connor 3ecf0055b5 spacing 2018-07-09 13:07:16 -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
Isaac Connor cf4a1c73fd Always us /zm in cache_bust 2018-07-04 14:46:22 -04: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
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 24ceb75936 Merge branch 'master' into include_fs_config_in_api_config 2018-06-21 21:41: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
Carlos R. Pasqualini 5e43cd99bc Change langfile's charset to UTF-8 as in #583 2018-06-19 20:38:55 -03:00
Isaac Connor b0411cbfd2 Merge branch 'master' into storageareas 2018-06-16 16:47:53 -04:00