Isaac Connor
|
bcb18b927b
|
mention that you must set ZM_SERVER_NAME in /etc/zm/zm.conf
|
2015-12-21 13:05:56 -05:00 |
|
Isaac Connor
|
70cac99e17
|
fix claim that live view must be done on host server
|
2015-12-21 13:03:52 -05:00 |
|
Isaac Connor
|
b33c0764fe
|
update to new cgi-bin path
|
2015-12-21 12:59:52 -05:00 |
|
Isaac Connor
|
dfd7986c01
|
Merge branch 'master' into multi-server
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
|
2015-12-21 12:57:45 -05:00 |
|
Isaac Connor
|
af9fc1de90
|
revert white space changes.
|
2015-12-21 12:57:05 -05:00 |
|
Isaac Connor
|
48bccc7963
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-12-21 12:55:50 -05:00 |
Isaac Connor
|
118dc12ad5
|
id => Id
|
2015-12-21 11:25:17 -05:00 |
|
Isaac Connor
|
f6d52e77b9
|
it is important to return the object from the constructor
|
2015-12-21 11:13:21 -05:00 |
|
Isaac Connor
|
ac88867fd2
|
fix namespace for dbh
|
2015-12-21 11:10:24 -05:00 |
|
Isaac Connor
|
8682b1af28
|
rough in a Storage class for the perl side of things
|
2015-12-21 11:03:53 -05:00 |
|
Isaac Connor
|
6f5c70dd5d
|
Add Attr lines for ServerId and ServerName
|
2015-12-21 10:10:11 -05:00 |
|
Isaac Connor
|
b626712a2f
|
Add ServerId and ServerName to fields that we can filter on
|
2015-12-21 10:03:48 -05:00 |
Steve Gilvarry
|
55cd097e5f
|
Merge pull request #1200 from pliablepixels/documentation
Updated mobile app info
|
2015-12-21 08:54:29 +11:00 |
arjunrc
|
6ccf36bc77
|
updated mobile app info
|
2015-12-20 14:55:48 -05:00 |
|
Isaac Connor
|
f4debc203d
|
Only run zmupdate.pl if the mysql db is located here
|
2015-12-20 12:23:40 -05:00 |
|
Isaac Connor
|
9743bad13f
|
Add a valid config if a person is using mod_fcgid instead of mod_php
|
2015-12-20 12:21:18 -05:00 |
|
Isaac Connor
|
4ef35c8c70
|
No need for a cgi-bin link
|
2015-12-20 11:23:01 -05:00 |
|
Isaac Connor
|
9c2707deba
|
update paths to /usr/share/zoneminder/www and /usr/lib/zoneminder/cgi-bin
|
2015-12-20 11:22:12 -05:00 |
Isaac Connor
|
37212dcf2e
|
Merge pull request #1196 from pliablepixels/api-more-security
Api more security
|
2015-12-20 10:22:40 -05:00 |
|
Steve Gilvarry
|
dd0842557d
|
Merge pull request #1199 from SteveGilvarry/feature-h264-videostorage
Merge master to feature-h264-videostorage
|
2015-12-20 14:18:46 +11:00 |
SteveGilvarry
|
e28e3c2b75
|
Merge branch 'master' into feature-h264-videostorage
|
2015-12-20 14:13:30 +11:00 |
|
SteveGilvarry
|
9acc0c34ed
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-20 14:09:26 +11:00 |
|
arjunrc
|
6e606aa74b
|
removed issue #
|
2015-12-19 19:04:27 -05:00 |
|
arjunrc
|
38b4785557
|
PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson
|
2015-12-19 18:36:38 -05:00 |
|
Steve Gilvarry
|
66ec7d74fd
|
Merge pull request #1194 from pliablepixels/documentation
All checks out fine on my RTD instance so merging
|
2015-12-20 09:53:14 +11:00 |
|
arjunrc
|
c4461c328e
|
initial user role support
|
2015-12-19 17:45:03 -05:00 |
|
arjunrc
|
b4fdaa9b4d
|
initial user role support
|
2015-12-19 17:44:46 -05:00 |
|
arjunrc
|
e812398fb9
|
initial user role support
|
2015-12-19 17:44:39 -05:00 |
|
arjunrc
|
f56688e7c2
|
initial user role support
|
2015-12-19 17:44:16 -05:00 |
|
arjunrc
|
028c9b956c
|
check for opt_use_api, also pull in user roles support
|
2015-12-19 17:44:02 -05:00 |
|
arjunrc
|
27b1b37d5b
|
added opt_use_api
|
2015-12-19 17:43:36 -05:00 |
|
arjunrc
|
cbea550d70
|
custom theming for ZM
|
2015-12-19 16:53:47 -05:00 |
|
arjunrc
|
c4bdb127ce
|
fixed custom style breaking rtd theme
|
2015-12-19 16:53:30 -05:00 |
Andrew Bauer
|
88ae78ed3c
|
Merge pull request #1190 from SteveGilvarry/libvlc_segfault
Fixes #1179 Libvlc Live555 Segmentation Fault
|
2015-12-19 15:44:28 -06:00 |
|
arjunrc
|
2763c3d92e
|
deleted
|
2015-12-19 13:40:21 -05:00 |
|
arjunrc
|
3fe64f8ce6
|
rtd theme
|
2015-12-19 13:38:54 -05:00 |
|
SteveGilvarry
|
def5d5552a
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-20 01:56:55 +11:00 |
|
Steve Gilvarry
|
28d7e3d59c
|
Merge pull request #1033 from knnniggett/maxfps
add warning and help text for maxfps fields
|
2015-12-20 01:50:48 +11:00 |
|
Andy Bauer
|
e5f243a9f8
|
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
|
2015-12-19 08:16:20 -06:00 |
|
SteveGilvarry
|
b78deb192b
|
Add some documentation on Multi-Server
|
2015-12-19 20:51:19 +11:00 |
|
Steve Gilvarry
|
ff4a1743b2
|
Merge pull request #1193 from pliablepixels/documentation
Documentation updated for ubuntu
|
2015-12-19 14:12:15 +11:00 |
|
Steve Gilvarry
|
e3d634e53e
|
Merge pull request #1182 from ZoneMinder/one_eighth
add a 1/8th scale option, which is useful for 1920x1080 streams
|
2015-12-19 14:07:18 +11:00 |
|
SteveGilvarry
|
01dd4ac67a
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-19 13:49:52 +11:00 |
|
arjunrc
|
b444061cc6
|
removed -master from ppa - when 1.29 releases it will be stable
|
2015-12-18 15:11:05 -05:00 |
|
arjunrc
|
511421bff1
|
rewrite
|
2015-12-18 15:08:56 -05:00 |
|
arjunrc
|
9e2b1ba3cb
|
remove hardcoded version
|
2015-12-18 15:08:40 -05:00 |
|
Isaac Connor
|
983d87f69b
|
increase height and width of groups window to fit buttons in
|
2015-12-18 13:34:44 -05:00 |
|
Isaac Connor
|
ca45ac23fa
|
increase height of group edit window
|
2015-12-18 13:30:42 -05:00 |
|
SteveGilvarry
|
af76d19646
|
Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555.
|
2015-12-18 01:47:10 +11:00 |
|
SteveGilvarry
|
8f272137e6
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-17 09:23:40 +11:00 |