RBxx
|
0ccce76ef8
|
Convert ru_ru.php to UTF-8
In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
|
2015-12-31 16:58:56 +03:00 |
Andrew Bauer
|
0c872c292f
|
Merge pull request #1201 from ZoneMinder/fix_zmaudit_monitors_starting_with_a_digit
Skip directories that have non-digits in them
|
2015-12-31 07:15:33 -06:00 |
SteveGilvarry
|
072c11fa82
|
Fix image border
|
2015-12-31 16:53:38 +11:00 |
|
SteveGilvarry
|
15fbf587db
|
Fix heading indentation
|
2015-12-31 16:45:22 +11:00 |
|
SteveGilvarry
|
251d73ffe0
|
Edit Toc
|
2015-12-31 16:40:49 +11:00 |
|
SteveGilvarry
|
3c2c393de6
|
Initial draft of Multi-server install docs
|
2015-12-31 16:24:56 +11:00 |
Isaac Connor
|
3a18a62bc6
|
Add ServerId column when inserting log line into database
|
2015-12-30 08:29:45 -05:00 |
Adam Reiser
|
659b3f37f5
|
Stylistic fix
|
2015-12-29 21:08:24 -08:00 |
|
Adam Reiser
|
28bf4dfe7b
|
Add option for strict host key checking
|
2015-12-29 16:34:11 -08:00 |
Isaac Connor
|
f357ea6ccd
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-12-28 11:53:04 -05:00 |
|
Isaac Connor
|
ccded54937
|
put back missing col++
|
2015-12-28 11:52:40 -05:00 |
|
SteveGilvarry
|
3f1c782ff7
|
Fix random extra semicolon
|
2015-12-28 16:29:04 +11:00 |
|
Andrew Bauer
|
e6e8a75b64
|
Update zoneminder.f23.spec
|
2015-12-27 11:48:53 -06:00 |
|
Isaac Connor
|
8dc7b3cee1
|
Merge branch 'master' into multi-server
|
2015-12-24 15:13:35 -05:00 |
Isaac Connor
|
66a828b4d4
|
Merge pull request #1202 from SteveGilvarry/MissingRTDTheme
Missing rtd theme
|
2015-12-23 14:05:36 -05:00 |
SteveGilvarry
|
abda4411e9
|
Revert to Default Theme, RTD will use their own and local builds default sphinx theme
|
2015-12-23 19:34:31 +11:00 |
|
SteveGilvarry
|
6e567e2878
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-23 19:29:14 +11:00 |
|
Isaac Connor
|
39bcb20dac
|
Skip directories that have non-digits in them
|
2015-12-22 12:59:37 -05:00 |
|
Isaac Connor
|
6df1425897
|
Slight update to allow the instantiation with no row or Id
|
2015-12-22 09:52:33 -05:00 |
|
Isaac Connor
|
1aa79c306b
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-12-22 09:47:45 -05:00 |
|
Isaac Connor
|
658e130d33
|
sync up to c39 version
|
2015-12-22 09:44:46 -05:00 |
|
Isaac Connor
|
82a9e9099f
|
Merge branch 'master' into multi-server
|
2015-12-22 09:40:50 -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
|
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
|
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 |
|
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 |