Isaac Connor
|
a840246849
|
Add Server dropdown for ServerId
|
2015-12-21 14:29:53 -05:00 |
|
Isaac Connor
|
892623ce63
|
Use * to grab all Event columns
|
2015-12-21 14:14:00 -05:00 |
|
Isaac Connor
|
aa9a6ddcc3
|
populate dropdown with the available storage areas when StorageId is selected
|
2015-12-21 14:12:33 -05:00 |
Isaac Connor
|
e76cc59bad
|
revert whitespace changes
|
2015-12-21 13:42:44 -05:00 |
|
Isaac Connor
|
36f83aa412
|
revert whitespace changes
|
2015-12-21 13:35:17 -05:00 |
|
Isaac Connor
|
609ab79f81
|
revert whitespace changes
|
2015-12-21 13:32:57 -05:00 |
|
Isaac Connor
|
1fee421500
|
revert whitespace changes
|
2015-12-21 13:29:41 -05:00 |
|
Isaac Connor
|
c0a79567e6
|
revert whitespace changes
|
2015-12-21 13:26:24 -05:00 |
|
Isaac Connor
|
0cb2d141a5
|
Fix dbh's
|
2015-12-21 13:16:07 -05:00 |
|
Isaac Connor
|
fdf1912ec1
|
revert whitespace changes
|
2015-12-21 13:11:18 -05:00 |
|
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
|
5683210e42
|
Add missing ;
|
2015-12-21 12:42:00 -05:00 |
|
Isaac Connor
|
ca07b951cb
|
Merge branch 'master' into newpointone
Conflicts:
docs/installationguide/ubuntu.rst
|
2015-12-21 12:41:25 -05:00 |
|
Isaac Connor
|
f6fd4671fe
|
make zmfilter aware of StorageAreas
|
2015-12-21 12:40:39 -05:00 |
|
Isaac Connor
|
1039207f3a
|
Use Event->delete instead of our own delete code
|
2015-12-21 12:31:48 -05:00 |
|
Isaac Connor
|
2dfab0b408
|
Add delete and delete_files methods
|
2015-12-21 12:29:35 -05:00 |
|
Isaac Connor
|
872e5eff15
|
Merge branch 'multi-server' into newpointone
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
|
2015-12-21 11:35:16 -05:00 |
|
Isaac Connor
|
c2a857b498
|
Merge branch 'storageareas' into newpointone
|
2015-12-21 11:34:27 -05:00 |
|
Isaac Connor
|
3d00c3a50d
|
Make getDiskPercent take an optional path. When a Server is specified, add it to the Filter object so that we can use in getDiskPercent
|
2015-12-21 11:34:12 -05:00 |
|
Isaac Connor
|
710197a4f2
|
Merge branch 'filter_object' into storageareas
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
scripts/zmfilter.pl.in
|
2015-12-21 11:27:48 -05:00 |
|
Isaac Connor
|
de83872671
|
id => Id
|
2015-12-21 11:25:38 -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
|
9f02f4353c
|
it is important to return the object from the constructor
|
2015-12-21 11:13:01 -05:00 |
|
Isaac Connor
|
e7c337f9f3
|
fix namespace for dbh
|
2015-12-21 11:10:45 -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
|
30353fbcf9
|
Add special case for Server Attr's because they are on the Monitor, not the event
|
2015-12-21 10:33:19 -05:00 |
|
Isaac Connor
|
5553760222
|
Add special cases for ServerId, ServerName, ServerHost to handle supplying the value of the host that the script is running on.
|
2015-12-21 10:23:37 -05:00 |
|
Isaac Connor
|
2548ec3bc0
|
Add Attr lines for StrageId and StorageName
|
2015-12-21 10:10:53 -05:00 |
|
Isaac Connor
|
6f5c70dd5d
|
Add Attr lines for ServerId and ServerName
|
2015-12-21 10:10:11 -05:00 |
|
Isaac Connor
|
00c4eedb90
|
Add StorageId and StorageName to fields that we can filter on
|
2015-12-21 10:04:13 -05:00 |
|
Isaac Connor
|
b626712a2f
|
Add ServerId and ServerName to fields that we can filter on
|
2015-12-21 10:03:48 -05:00 |
|
Isaac Connor
|
fc981e063e
|
snap release adding zmvideo
|
2015-12-21 10:01:55 -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
|
27597c3401
|
Merge branch 'master' into storageareas
Conflicts:
docs/installationguide/ubuntu.rst
|
2015-12-20 11:19:44 -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 |