laf
|
4a2ba3df54
|
Updated test-transprot include
|
2015-08-13 13:13:53 +00:00 |
|
laf
|
700b99b2a4
|
Merge branch 'master' of github.com:laf/librenms into issue-1626
|
2015-08-13 13:13:06 +00:00 |
|
Daniel Preussker
|
97efcaef15
|
Merge pull request #1659 from laf/mysql-strict
Couple more mysql strict fixes
|
2015-08-13 12:33:29 +02:00 |
|
Daniel Preussker
|
d6f05b0b1a
|
Merge pull request #1653 from laf/security-update
Moved forms folder to includes and added some safety checks for non-admin users
|
2015-08-13 12:32:01 +02:00 |
|
Daniel Preussker
|
eaa48e7181
|
Merge pull request #1678 from SaaldjorMike/typo2
Fix spelling error in comment
|
2015-08-13 12:29:15 +02:00 |
|
Mike Rostermund
|
3ae60e8b40
|
Fix spelling error in comment
|
2015-08-13 12:28:06 +02:00 |
|
Daniel Preussker
|
d32699741c
|
Merge pull request #1676 from tuxis-ie/patch-1
Update Billing-Module.md
|
2015-08-13 11:37:12 +02:00 |
|
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 |
|
Michael Newton
|
0dfbf71886
|
update AUTHORS
|
2015-08-11 15:06:53 -07:00 |
|
Michael Newton
|
f77c712bfc
|
changes needed to run under web server subdirectory
|
2015-08-11 14:54:05 -07:00 |
|
laf
|
d7cd1ff0f6
|
Added accept header to call to graylog api
|
2015-08-11 14:50:05 -07:00 |
|
Michael Newton
|
c1b9856d89
|
Merge remote-tracking branch 'upstream/master'
|
2015-08-11 14:38:39 -07:00 |
|
Michael Newton
|
2267e371b9
|
check for sites where there is no subdirectory
|
2015-08-11 14:22:20 -07: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
|
05b45c438a
|
Added docs on using Grallog integration
|
2015-08-11 09:44:35 -07: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 |
|
laf
|
812f79f2af
|
Added ability to send test alerts via each transport
|
2015-08-11 15:58:49 +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
|
9925e35224
|
Couple more mysql strict fixes
|
2015-08-11 11:38:05 +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 |
|
laf
|
d98387b8b3
|
Added back the longer words as they still fit
|
2015-08-10 23:12:33 +00:00 |
|
laf
|
8676a0c22f
|
Updated interface graph formatting for non unicast
|
2015-08-10 23:01:14 +00:00 |
|
Paul Gear
|
5d3701e3a6
|
Update install.php
spelling
|
2015-08-11 08:39:14 +10:00 |
|
Neil Lathwood
|
06430a9edc
|
Added graylog support
|
2015-08-10 13:36:55 -07: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 |
|