Isaac Connor
|
8bbb4dae69
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2018-10-08 09:56:19 -04:00 |
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
|
c1de20a081
|
use $Event rather than $event (#2240)
|
2018-10-08 09:25:17 -04:00 |
Isaac Connor
|
4a642e1a9d
|
pass Event instead of event to executeCommand
|
2018-10-08 08:31:16 -04:00 |
Pliable Pixels
|
fc4a84011b
|
added note on auth hash logins (#2237)
* added note on auth hash logins
* code inline escape fix
|
2018-10-06 15:38:30 -04:00 |
Isaac Connor
|
9275a1d046
|
fix missing spaces after 'to' and some spacing and quotes
|
2018-10-05 09:45:47 -04:00 |
Isaac Connor
|
1b1d420bc5
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-04 10:47:49 -04:00 |
Isaac Connor
|
56b31becb2
|
Add explicit db disconnect in Fatal(). If we don't disconnect then we leave sockets hanging around in TIME_WAIT (I think).
|
2018-10-04 10:47:38 -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
|
633fbfc5b4
|
rework release mode. When doing a release, we cannot regenerate the .orig tarball for each distro. It has to be the same or else the ppa will reject any further uploads. So now the distro command line parameter can be a comma separated list of distros to build for and will default to xenial,bionic,trusty
|
2018-10-03 13:03:44 -04: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
|
5f89931774
|
Add grabbing original source tarball from github and overwriting the generated tarball with it.
|
2018-10-02 15:53:32 -04:00 |
Isaac Connor
|
d2c2fbbfb9
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-02 15:19:31 -04:00 |
Isaac Connor
|
246f3755a2
|
Update docs regarding ppa for 1.32 and 1.32 not needing mysql config changes
|
2018-10-02 15:19:19 -04:00 |
Andy Bauer
|
5c6cf88d93
|
bump version to 1.32.1
|
2018-10-02 07:37:55 -05: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
|
c94367c7ad
|
The uploadArchFile takes an Event object now
|
2018-09-29 08:32:57 -04:00 |
Andrew Bauer
|
b533c8b257
|
don't zmMemInvalidate when reloading monitors (#2225)
* remove call to zmMemVerify when reloading monitors
* need to call zmMemVerify to attach to the mem handle
|
2018-09-28 13:35:42 -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
|
fe444218cc
|
Implement replay mode = none in zms. This mode was only handled for video html tag viewing.
|
2018-09-28 12:31:53 -04:00 |
Isaac Connor
|
c481fc868f
|
be more robust when curFrames is empty.
|
2018-09-28 11:25:19 -04:00 |
Isaac Connor
|
e6f366c5cb
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2018-09-28 09:48:37 -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
|
66f11435b9
|
perhaps fix memory corruption due to libx264 writing to stderr which may be closed.
|
2018-09-27 13:50:11 -04:00 |
Isaac Connor
|
49a7614504
|
revert change that breaks building on newer ffmpeg libs.
|
2018-09-26 18:35:29 -04:00 |
Isaac Connor
|
7ac955d005
|
further changes to ensure that source .orig tarball is always the same
|
2018-09-26 16:44:04 -04:00 |
Isaac Connor
|
fe0ebc7067
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-26 16:20:40 -04:00 |
Isaac Connor
|
5ef64bf256
|
fix memleak on old libav distros
|
2018-09-26 16:20:29 -04:00 |
Isaac Connor
|
dbafffecb8
|
remove extra \
|
2018-09-26 16:20:08 -04:00 |
Andrew Bauer
|
c9aedb9249
|
Merge pull request #2222 from pliablepixels/patch-4
added note to make sure headers is on
|
2018-09-26 14:37:33 -05:00 |
Isaac Connor
|
51f0e7e5c8
|
Add a default timebase if the codec timebase is invalid. Also fix crash when we can't open the .mp4
|
2018-09-26 15:34:01 -04:00 |
Isaac Connor
|
1419f20dcc
|
add setting rtsp_transport to udp. It is the default but we print out an error otherwise
|
2018-09-26 15:33:29 -04:00 |
Isaac Connor
|
2385c80a4a
|
cleanup code a bit
|
2018-09-26 15:32:54 -04:00 |
Pliable Pixels
|
940ad3fe68
|
made message generic
|
2018-09-26 14:47:20 -04:00 |
Isaac Connor
|
41f1fbbec6
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-26 14:11:01 -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
|
6bca9415e8
|
added note to make sure headers is on
|
2018-09-26 10:17:16 -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 |