7448 Commits

Author SHA1 Message Date
Tuxis Internet Engineering V.O.F.
a4fcfe2c34 Update Billing-Module.md
This doesn't need to run as root...
2015-08-13 11:36:08 +02:00
Daniel Preussker
409b2efd17 Merge pull request #1647 from laf/issue-12-new
Added mysqli support
2015-08-12 22:06:09 +02:00
laf
a8c03ca786 Last fix 2015-08-12 19:55:37 +00:00
Neil Lathwood
3921a6fc8b Merge pull request #1609 from SaaldjorMike/remove-unused
Removed unused default variables
2015-08-12 20:45:03 +01:00
Neil Lathwood
f74ed3a1b8 Merge pull request #1673 from dlangille/patch-1
Correct path to defaults.inc.php
2015-08-12 20:42:19 +01:00
Dan Langille
d988693564 Correct path to defaults.inc.php 2015-08-12 15:13:58 -04:00
Daniel Preussker
7e38bb001c Merge pull request #1671 from laf/discovery-arp-fix
Erm, no idea what that is doing in there!
2015-08-12 15:51:23 +00:00
laf
8bb2314534 Erm, no idea what that is doing in there! 2015-08-12 15:48:04 +00:00
Mike Rostermund
c2c8aa8276 Removed documentation for configuration options which are not implemented 2015-08-12 17:11:08 +02:00
Mike Rostermund
af80d4539b Removed unused default variables. 2015-08-12 17:10:32 +02:00
Mike Rostermund
5b58baccc0 Removed a line which was commented out. 2015-08-12 17:10:15 +02:00
Søren Rosiak
2a365344dc Merge pull request #1656 from laf/upgrade-scripts 2015-08-11 22:38:05 +02:00
Søren Rosiak
060b0e3e22 Merge pull request #1660 from laf/issue-1652 2015-08-11 22:33:42 +02:00
Neil Lathwood
bbf6f433b8 Merge pull request #1666 from librenms/revert-1645-master
Revert "changes needed to run under web server subdirectory"
2015-08-11 21:31:58 +01:00
Neil Lathwood
945ca7f2ea Revert "changes needed to run under web server subdirectory" 2015-08-11 21:25:23 +01:00
laf
936fb32a9e Used oid instead of static 2015-08-11 20:20:02 +00:00
Søren Rosiak
9af75b40fa Merge pull request #1664 from laf/docs-alerting 2015-08-11 22:18:28 +02:00
Søren Rosiak
5d57063dcd Merge pull request #1658 from laf/issue-1022 2015-08-11 22:14:46 +02:00
laf
b1fcc3c84b updated firmware to version 2015-08-11 20:11:04 +00:00
Neil Lathwood
f266aa044b Merge pull request #1661 from mmarchand/issue-1641
Update IOS-XR watts to be dbm sensor as well
2015-08-11 18:45:15 +01:00
Mickael Marchand
f260fccacf I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md 2015-08-11 19:34:34 +02:00
Neil Lathwood
1b6b57b593 Merge pull request #1645 from miken32/master
changes needed to run under web server subdirectory
2015-08-11 18:32:53 +01:00
laf
5b7e09b729 Updated alerting docs to cross out config.php options to push people towards Webui 2015-08-11 16:29:59 +00:00
Søren Rosiak
9191f56d06 Merge pull request #1663 from laf/issue-1657 2015-08-11 18:28:44 +02:00
laf
efee54043a Swapped 2012 Datacenter / Non-DC around 2015-08-11 16:05:04 +00:00
Mickael Marchand
011181c622 IOS-XR does not provide dbm values for transceivers so we calculate them from mWatts entries
Fix #1641
2015-08-11 16:35:29 +02:00
laf
c652cb652e Added serial,version, cpu and mem for zywall 2015-08-11 12:32:54 +00:00
laf
53c15fc7df Updated customers page to use bootgrid 2015-08-11 10:38:25 +00:00
laf
e02912ec02 Removed unused files 2015-08-10 23:45:41 +00:00
Neil Lathwood
ed2e072d09 Merge pull request #1654 from librenms/paulgear-patch-1
Update install.php
2015-08-11 00:13:14 +01:00
Paul Gear
5d3701e3a6 Update install.php
spelling
2015-08-11 08:39:14 +10:00
Michael Newton
6ea5b88025 I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2015-08-10 10:44:00 -07:00
Michael Newton
aa57c952f9 adding documentation 2015-08-10 10:43:11 -07:00
Michael Newton
8cf23acdba updating authors 2015-08-10 09:55:19 -07:00
Daniel Preussker
e8a74e17a6 Merge pull request #1651 from laf/location-fix
Fixes issues with addresses having ' in
2015-08-09 21:35:46 +00:00
Daniel Preussker
249e89f09d Merge pull request #1649 from arnoldthebat/issue-1648
Fixed Synology System Temerature being overwritten
2015-08-09 21:35:14 +00:00
laf
11b708c102 Fixes issues with addresses having ' in 2015-08-09 21:17:54 +00:00
tony Ditchfield
ae6e01e195 Resigning 2015-08-09 19:31:46 +01:00
tony Ditchfield
81ed33ee71 Fixed Synology System Temerature being overwritten 2015-08-09 19:10:48 +01:00
laf
880cccf57b Added some docs, update config.php.default and web installer to use mysqli by default 2015-08-09 14:36:31 +00:00
Daniel Preussker
15a338061d Merge pull request #1582 from laf/issue-1461-old
Updated network to support old style format, docs provided
2015-08-09 12:10:08 +00:00
Daniel Preussker
25f64d5fc7 Merge pull request #1606 from laf/billing-api-fix
Billing API Scrut fixes
2015-08-09 10:46:16 +00:00
Daniel Preussker
6b020e0d82 Merge pull request #1613 from laf/issue-1524
Added edit page to update storage percent warn value
2015-08-09 09:26:17 +00:00
laf
ca60b5268a Scrut fix 2015-08-09 09:22:48 +00:00
Daniel Preussker
6b91456eb6 Merge pull request #1638 from laf/strict-fixes
Two fixes for mysql strict mode
2015-08-09 09:19:07 +00:00
laf
4b49c148b6 Added mysqli support 2015-08-08 19:27:18 +00:00
Daniel Preussker
442af615ba Merge pull request #1646 from laf/alert-widget-fix
Updated gridster variables to be custom per widget
2015-08-08 09:47:37 +00:00
laf
75a7f4833e Updated gridster variables to be custom per widget 2015-08-08 09:43:28 +00:00
Michael Newton
cc0f449fc9 changes needed to run under web server subdirectory 2015-08-07 11:10:43 -07:00
Daniel Preussker
904a2099b5 Merge pull request #1643 from infernix/ifalias-null-reorder
Reorder ifalias_null check to prevent var flapping
2015-08-07 17:37:42 +00:00