Commit Graph

11846 Commits

Author SHA1 Message Date
Neil Lathwood
c763d4deff Merge pull request #4137 from crcro/emc-flare-os-fix
emc flareos definitions update
2016-08-20 01:17:41 +01:00
Neil Lathwood
7f2cb23acb Merge pull request #4133 from murrant/str-helpers
String helper functions
2016-08-20 01:15:23 +01:00
Neil Lathwood
fb935cdb30 Merge pull request #4122 from murrant/more-avail
Availability: small changes
2016-08-20 01:13:58 +01:00
Neil Lathwood
d7f6f0b428 Merge pull request #4119 from crcro/hp2530
hp 2530 series procurve/aruba detection
2016-08-20 01:09:08 +01:00
Neil Lathwood
87c793f2c3 Merge pull request #4116 from crcro/hwg-ste2
HWGroup STE2 support
2016-08-20 01:08:01 +01:00
Neil Lathwood
6ffc913275 Merge pull request #4138 from laf/docs-cname
Added CNAME for doc folder
2016-08-20 00:35:55 +01:00
laf
4518e64922 Added CNAME for doc folder 2016-08-20 00:34:03 +01:00
Neil Lathwood
6531bb7bb8 Merge pull request #4088 from adaniels21487/issue-4083
Added OS detection for Cisco Prime Infrastructure
2016-08-20 00:22:21 +01:00
Neil Lathwood
d7f9e30d8f Merge pull request #4117 from murrant/psr2-html
PSR2 Cleanup: /html edition
2016-08-20 00:12:24 +01:00
crcro
ea38d55b9e removed top graph for cpu/mem/storage as they won't get anydata from flareos via snmp 2016-08-20 02:02:33 +03:00
crcro
1de76192c5 Revert "added to arubaos"
This reverts commit 29d5b8a5af.
2016-08-20 01:42:49 +03:00
Tony Murray
1b0e783b44 Update Applications.md
Fix spacing
2016-08-19 15:37:20 -05:00
Tony Murray
0074d5a6d2 Arch linux alternate db suggestion 2016-08-19 15:35:04 -05:00
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 Preussker
c3d2dca6a3 Merge pull request #4131 from murrant/travis-phpunit
Restore phpunit tests in travis-ci
2016-08-19 18:35:34 +00:00
Daniel Preussker
0aa3194464 Merge pull request #4128 from benwa/patch-2
Update AUTHORS.md
2016-08-19 18:31:43 +00:00
Daniel Preussker
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 Blodinger
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 Blodinger
60e13a5d15 Update device-summary-vert.inc.php 2016-08-19 13:45:04 -04:00
Bennett Blodinger
aeb1c1fc43 Keep theme consistent on tables
Makes the tables a bit more uniform
2016-08-19 13:39:58 -04:00
Tony Murray
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 Lathwood
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 Lathwood
da13b55734 Merge pull request #4123 from murrant/rrd-fix
Quick and dirty fix for #4102
2016-08-19 16:52:26 +01:00
Neil Lathwood
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 Lathwood
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 Lathwood
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 Lathwood
f0c82498b5 Merge pull request #4114 from regnauld/patch-1
Fix typo in Updating.md
2016-08-18 23:48:05 +01:00
Neil Lathwood
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 Regnauld
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 Regnauld
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 Lathwood
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 Lathwood
cbf1ec09c3 Merge pull request #4106 from murrant/availibilty-shadows
Availability map: shadow
2016-08-18 21:47:09 +01:00
Neil Lathwood
7bdc3f488a Merge pull request #4101 from murrant/namespaces
Use namespaces for classes, take 2
2016-08-18 21:41:39 +01:00
Neil Lathwood
5ecef5c4df Merge pull request #4082 from murrant/rrd-check
c_echo
2016-08-18 21:32:20 +01:00