7533 Commits

Author SHA1 Message Date
laf
a8f0d91aae Fixed the connection settings being incorrect 2015-08-15 17:33:41 +00:00
3745ffdc1c Merge pull request #1697 from laf/build-fix 2015-08-15 12:42:33 +01:00
laf
f4f2c652ac Fix missing parameter for mysqli_select_db 2015-08-15 09:55:53 +00:00
f69189f87d Merge remote-tracking branch 'librenms/master' into issue-1695 2015-08-15 10:11:25 +02:00
2d1228adb2 Correct DSM upgrade status OID 2015-08-15 10:09:10 +02:00
e1787a423a Merge pull request #1691 from Rosiak/issue-1670
Fix #1670
2015-08-15 09:46:54 +02:00
543a67851c Fix #1670
- Convert column to bigint to support 4 byte ASN
2015-08-14 20:54:56 +02:00
bd732d8751 Merge pull request #1690 from Tawmu/master
Authors Agreement
2015-08-14 15:39:07 +01:00
dad22b4bd4 Authors Agreement
I agree to the conditions of the Contributor Agreement contained in
doc/General/Contributing.md.
2015-08-14 15:24:59 +01:00
0737722cb8 Merge pull request #1667 from miken32/master
changes needed to run under a web server subdirectory
2015-08-14 15:05:29 +01:00
cde6da72fb I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2015-08-13 16:19:45 -07:00
a0afc0e279 Merge pull request #1685 from f0o/issue-1630
Reformated eventlog messages to represent the state of the trigger
2015-08-13 22:07:35 +01:00
f0o
ec6dc0fb40 Reformated eventlog messages to represent the state of the trigger 2015-08-13 20:37:05 +00:00
9f11c2720b Merge pull request #1655 from laf/issue-1009-new
Updated interface graph formatting for non unicast
2015-08-13 21:04:00 +02:00
laf
a76ca414d1 updated ave to avg 2015-08-13 18:17:59 +00:00
6a13af4a46 Merge pull request #1662 from laf/issue-1626
Added ability to send test alerts via each transport
2015-08-13 15:42:16 +02:00
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
97efcaef15 Merge pull request #1659 from laf/mysql-strict
Couple more mysql strict fixes
2015-08-13 12:33:29 +02:00
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
eaa48e7181 Merge pull request #1678 from SaaldjorMike/typo2
Fix spelling error in comment
2015-08-13 12:29:15 +02:00
3ae60e8b40 Fix spelling error in comment 2015-08-13 12:28:06 +02:00
d32699741c Merge pull request #1676 from tuxis-ie/patch-1
Update Billing-Module.md
2015-08-13 11:37:12 +02:00
a4fcfe2c34 Update Billing-Module.md
This doesn't need to run as root...
2015-08-13 11:36:08 +02:00
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
3921a6fc8b Merge pull request #1609 from SaaldjorMike/remove-unused
Removed unused default variables
2015-08-12 20:45:03 +01:00
f74ed3a1b8 Merge pull request #1673 from dlangille/patch-1
Correct path to defaults.inc.php
2015-08-12 20:42:19 +01:00
d988693564 Correct path to defaults.inc.php 2015-08-12 15:13:58 -04:00
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
c2c8aa8276 Removed documentation for configuration options which are not implemented 2015-08-12 17:11:08 +02:00
af80d4539b Removed unused default variables. 2015-08-12 17:10:32 +02:00
5b58baccc0 Removed a line which was commented out. 2015-08-12 17:10:15 +02:00
0dfbf71886 update AUTHORS 2015-08-11 15:06:53 -07:00
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
c1b9856d89 Merge remote-tracking branch 'upstream/master' 2015-08-11 14:38:39 -07:00
2267e371b9 check for sites where there is no subdirectory 2015-08-11 14:22:20 -07:00
2a365344dc Merge pull request #1656 from laf/upgrade-scripts 2015-08-11 22:38:05 +02:00
060b0e3e22 Merge pull request #1660 from laf/issue-1652 2015-08-11 22:33:42 +02:00
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
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
9af75b40fa Merge pull request #1664 from laf/docs-alerting 2015-08-11 22:18:28 +02:00
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
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
f260fccacf I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md 2015-08-11 19:34:34 +02:00
1b6b57b593 Merge pull request #1645 from miken32/master
changes needed to run under web server subdirectory
2015-08-11 18:32:53 +01:00