Isaac Connor
|
52b1439d51
|
fix the lack of /zm/index.php in url in Server->Url() and multiport
|
2018-10-08 09:55:47 -04:00 |
|
Isaac Connor
|
1eb8e9ed9e
|
Include PHP_SELF in url to Server. This will assume that all servers in a multi-server setup use the same path
|
2018-10-08 09:45:03 -04:00 |
Andrew Bauer
|
409fd6aa6f
|
Merge pull request #2232 from connortechnology/fix_2229_getDiskPercent
Fix 2229 get disk percent
|
2018-10-03 18:11:28 -05:00 |
Isaac Connor
|
04c06d0893
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-03 11:23:01 -04:00 |
|
Isaac Connor
|
66221e39ab
|
rough in a StorageController for api
|
2018-10-03 11:22:51 -04:00 |
|
Isaac Connor
|
12bed9b6ac
|
Use alternate, working test for relative ZM_DIR_EVENTS. Don't use human output from du when specifying mid to be consistent.
|
2018-10-03 11:11:33 -04:00 |
|
Isaac Connor
|
03f09bdc48
|
Use defined CONFIG constants instead of looking up config from db
|
2018-10-03 10:56:02 -04:00 |
Dhanika Bulathsinhala
|
e7790ebeef
|
Documentation Improvements + Fixes (#2230)
* get
* get
|
2018-10-03 10:29:10 -04:00 |
|
Isaac Connor
|
efda26121b
|
allow login by username&password in request
|
2018-10-02 16:59:05 -04:00 |
|
Isaac Connor
|
c9423aa902
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-01 10:40:20 -04:00 |
|
Isaac Connor
|
592f55a550
|
do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out.
|
2018-10-01 10:39:00 -04:00 |
|
Andrew Bauer
|
1978882825
|
dim x264 encode when on arm (#2227)
|
2018-10-01 09:17:22 -04:00 |
|
Isaac Connor
|
613d885930
|
!= E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than !=
|
2018-09-30 10:15:04 -04:00 |
|
Isaac Connor
|
c88dc690a6
|
Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order.
|
2018-09-28 13:24:50 -04:00 |
|
Isaac Connor
|
c481fc868f
|
be more robust when curFrames is empty.
|
2018-09-28 11:25:19 -04:00 |
|
Andrew Bauer
|
4b97fc9480
|
Merge pull request #2221 from pliablepixels/font-license
added license
|
2018-09-27 16:45:34 -05:00 |
|
Isaac Connor
|
c5c01d56be
|
fix unsetting fixed width/height/layout. Since they are actually controlled by cookies, the session will overwrite when we try to unset the cookie. Also fix some missing ;'s
|
2018-09-27 14:20:41 -04:00 |
|
Isaac Connor
|
7ffb46302f
|
When events have the same starttime, sort secondly by Id
|
2018-09-26 14:10:49 -04:00 |
Pliable Pixels
|
d1f93d752b
|
wrap again
|
2018-09-26 10:10:07 -04:00 |
|
Pliable Pixels
|
e27bd11f79
|
wrap
|
2018-09-26 10:08:08 -04:00 |
|
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
|
bf9ff8461c
|
Add WebSite to the Monitor type enumeration
|
2018-09-24 13:20:19 -04:00 |
|
Isaac Connor
|
c8c533ca2f
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-23 10:51:56 -04:00 |
|
Isaac Connor
|
c5b23807a4
|
put back overlay.js for log view.
|
2018-09-23 10:51:46 -04:00 |
|
Andrew Bauer
|
b8a2e71bb6
|
use base64_encode for monitor probe
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
|
2018-09-21 12:00:03 -05:00 |
|
Andrew Bauer
|
347c0d2ae4
|
fix whitespace
|
2018-09-20 13:41:13 -05:00 |
|
Andrew Bauer
|
ac9129b632
|
fix corrupted export downloads
|
2018-09-20 13:36:52 -05:00 |
|
Isaac Connor
|
999e4c6c43
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-20 13:37:46 -04:00 |
|
Isaac Connor
|
90d1d79e9a
|
Add missing AutoUpload field to Filter
|
2018-09-20 13:37:36 -04:00 |
Andy Bauer
|
f53533e61e
|
fix populating onvif probe data
|
2018-09-20 10:30:23 -05:00 |
|
Isaac Connor
|
ba4878d2b5
|
fix use of instead of ['limit']
|
2018-09-20 10:11:55 -04:00 |
|
Isaac Connor
|
503b40cb62
|
Need to cache the object not the row
|
2018-09-20 10:07:15 -04:00 |
|
Isaac Connor
|
6181e52c47
|
gracefully handle non-existence of imageFeed
|
2018-09-20 09:07:28 -04:00 |
|
Isaac Connor
|
c6e953c4a9
|
if Monitor is not found, return empty Monitor instead of null
|
2018-09-20 09:02:20 -04:00 |
|
Isaac Connor
|
c4108a2610
|
Fix missing quotes inc Event::Monitor
|
2018-09-20 08:59:15 -04:00 |
|
Isaac Connor
|
8a5c989cac
|
fix warning when editing users after a monitor has been deleted
|
2018-09-18 08:52:43 -04:00 |
|
Isaac Connor
|
7f98277571
|
Merge updated Monitor.php that does caching
|
2018-09-15 09:52:08 -04:00 |
|
Isaac Connor
|
b0c555599c
|
Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209
|
2018-09-15 09:42:59 -04:00 |
|
Isaac Connor
|
fa55cec12c
|
fix error when scale is auto
|
2018-09-14 16:57:28 -04:00 |
|
Isaac Connor
|
f1442eba90
|
once we have found a match for our origin, break out of loop
|
2018-09-14 14:56:26 -04:00 |
|
Isaac Connor
|
d9b1d3ec11
|
fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port
|
2018-09-14 14:52:33 -04:00 |
|
Isaac Connor
|
b5b71edbf6
|
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
|
2018-09-14 14:26:45 -04:00 |
|
Andrew Bauer
|
b3565fb983
|
remove file that should not be there
|
2018-09-12 07:02:57 -05:00 |
|
Andrew Bauer
|
c66dd25ebb
|
implement collapsible headers (#2203)
|
2018-09-11 17:39:40 -04:00 |
|
Isaac Connor
|
eef928a742
|
fix find_all => find
|
2018-09-11 14:31:03 -04:00 |
|
Isaac Connor
|
684f48979a
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-11 14:30:19 -04:00 |
|
Isaac Connor
|
8608fc97be
|
fix trms=>terms
|
2018-09-10 15:11:57 -04:00 |
|
Isaac Connor
|
0ee261fae3
|
get rid of code that hid the close/back button on events if there was no history.
|
2018-09-10 15:11:41 -04:00 |
|
Isaac Connor
|
534aebb21f
|
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
|
2018-09-09 16:36:09 -04:00 |