17185 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tony Murray	fd34c24f5c	String helper functions ... Bring some sanity to the madness	2016-08-19 14:57:08 -05:00
Tony Murray	46adc8b60c	Fix merge errors	2016-08-19 14:05:27 -05:00
Tony Murray	cfe2cf8069	Merge remote-tracking branch 'upstream/master' into psr2-html	2016-08-19 13:54:45 -05:00
Daniel PreusskerandGitHub	c3d2dca6a3	Merge pull request #4131 from murrant/travis-phpunit ... Restore phpunit tests in travis-ci	2016-08-19 18:35:34 +00:00
Daniel PreusskerandGitHub	0aa3194464	Merge pull request #4128 from benwa/patch-2 ... Update AUTHORS.md	2016-08-19 18:31:43 +00:00
Daniel PreusskerandGitHub	9dc86ac7c6	Merge pull request #4129 from benwa/patch-1 ... Keep theme consistent on tables	2016-08-19 18:31:19 +00:00
Tony Murray	c75f744931	Restore phpunit tests in travis-ci	2016-08-19 13:15:51 -05:00
Bennett BlodingerandGitHub	3f4ebe02a3	Update AUTHORS.md ... I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.	2016-08-19 13:49:06 -04:00
Bennett BlodingerandGitHub	60e13a5d15	Update device-summary-vert.inc.php	2016-08-19 13:45:04 -04:00
Bennett BlodingerandGitHub	aeb1c1fc43	Keep theme consistent on tables ... Makes the tables a bit more uniform	2016-08-19 13:39:58 -04:00
Tony MurrayandGitHub	9a66326fcf	Merge pull request #4115 from laf/install-docs-upd ... Update install doc file names to be clearer	2016-08-19 11:02:11 -05:00
Neil LathwoodandGitHub	8c37256c2d	Merge pull request #4126 from laf/new-docs ... Updated repo details	2016-08-19 16:54:52 +01:00
laf	3147a00258	Updated repo details	2016-08-19 16:54:30 +01:00
Neil LathwoodandGitHub	da13b55734	Merge pull request #4123 from murrant/rrd-fix ... Quick and dirty fix for #4102	2016-08-19 16:52:26 +01:00
Neil LathwoodandGitHub	2af9b963ea	Merge pull request #4125 from laf/new-docs ... Updated repo details	2016-08-19 16:44:35 +01:00
laf	7958ea821c	Updated repo details	2016-08-19 16:43:53 +01:00
Tony Murray	7941768933	Quick and dirty fix for #4102 ... Real fix is in #4104	2016-08-19 10:25:38 -05:00
Tony Murray	257cec197d	Availability: small changes ... Mouse pointer to indicate the labels are clickable. <label> is a form element and should not be a child of <a>, use span	2016-08-19 09:51:21 -05:00
Neil LathwoodandGitHub	af738aada4	Merge pull request #4121 from laf/new-docs ... Updated repo details	2016-08-19 15:27:33 +01:00
laf	c6d8604463	Updated repo details	2016-08-19 15:26:37 +01:00
Neil LathwoodandGitHub	2c5cff480a	Merge pull request #4120 from laf/new-docs ... Ready for new docs site	2016-08-19 14:54:30 +01:00
laf	ae7d13d299	Ready for new docs site	2016-08-19 14:37:44 +01:00
crcro	29d5b8a5af	added to arubaos	2016-08-19 12:25:54 +03:00
crcro	bd14338fec	fix for issue #4089	2016-08-19 12:08:19 +03:00
Tony Murray	8c639aa5a4	PSR2 Cleanup: /html edition ... Travis tests for code conformance. Ignore warnings for now. Fixed all errors, left most warnings.	2016-08-18 21:29:30 -05:00
crcro	a7441e6459	initial hw group ste2 device support	2016-08-19 02:21:00 +03:00
Neil LathwoodandGitHub	f0c82498b5	Merge pull request #4114 from regnauld/patch-1 ... Fix typo in Updating.md	2016-08-18 23:48:05 +01:00
Neil LathwoodandGitHub	c65931d2ab	Merge pull request #4113 from regnauld/patch-2 ... Update AUTHORS.md	2016-08-18 23:47:47 +01:00
laf	29870b1bc1	Update install doc file names to be clearer	2016-08-18 23:46:15 +01:00
Phil RegnauldandGitHub	f10b2d6ff0	Update AUTHORS.md ... I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.	2016-08-19 00:45:56 +02:00
Phil RegnauldandGitHub	621f4d2f4b	Fix typo in Updating.md	2016-08-19 00:44:02 +02:00
Aaron Daniels	a77536ba4b	Merge branch 'master' into issue-4083 ... Conflicts: includes/definitions.inc.php	2016-08-19 07:13:46 +10:00
Neil LathwoodandGitHub	340d4df91a	Merge pull request #4112 from laf/namespace-fix ... Fixed namespace issue	2016-08-18 22:06:33 +01:00
laf	2a54c096af	Fixed namespace issue	2016-08-18 22:06:00 +01:00
Neil LathwoodandGitHub	cbf1ec09c3	Merge pull request #4106 from murrant/availibilty-shadows ... Availability map: shadow	2016-08-18 21:47:09 +01:00
Neil LathwoodandGitHub	7bdc3f488a	Merge pull request #4101 from murrant/namespaces ... Use namespaces for classes, take 2	2016-08-18 21:41:39 +01:00
laf	ef7fac9a91	Fixed errors	2016-08-18 21:38:06 +01:00
Neil LathwoodandGitHub	5ecef5c4df	Merge pull request #4082 from murrant/rrd-check ... c_echo	2016-08-18 21:32:20 +01:00
Neil LathwoodandGitHub	637d01cd13	Merge pull request #4077 from murrant/ntpd-app ... NTPD Application	2016-08-18 21:30:33 +01:00
Neil LathwoodandGitHub	20932bd832	Merge pull request #4057 from crcro/raspberry-sensors ... Raspberry sensors	2016-08-18 21:28:32 +01:00
Søren RosiakandGitHub	aabc0eb7ab	Merge pull request #4065 from adaniels21487/issue-4062	2016-08-18 22:51:28 +03:00
Daniel PreusskerandGitHub	41afcb12a6	Merge pull request #4107 from librenms/revert-4044-issue-4020 ... Revert "Changed swos detection + more dsm support"	2016-08-18 16:38:54 +00:00
Daniel PreusskerandGitHub	1e1a0172fb	Revert "Changed swos detection + more dsm support"	2016-08-18 18:37:28 +02:00
Tony Murray	450049a431	Availability map: shadow	2016-08-18 11:23:34 -05:00
Tony MurrayandGitHub	22de3fca31	Merge pull request #4103 from vitalisator/issue-4094 ... DSname too long	2016-08-18 07:45:07 -05:00
vitalisator	2ecc764c8a	trim to 19 characters	2016-08-18 14:35:48 +02:00
vitalisator	6f7c62ce50	DSname too long	2016-08-18 11:26:52 +02:00
Daniel PreusskerandGitHub	c01eec8f26	Merge pull request #4048 from laf/issue-3982 ... Added support for Avaya VSP	2016-08-18 05:56:53 +00:00
Daniel PreusskerandGitHub	d5bc3b4b4b	Merge pull request #4044 from laf/issue-4020 ... Changed swos detection + more dsm support	2016-08-18 05:46:25 +00:00
Daniel PreusskerandGitHub	ac41ca980b	Merge pull request #4049 from laf/issue-3847 ... Added predicated usage to bills, basic at present	2016-08-18 05:39:59 +00:00