Commit Graph

3603 Commits

Author SHA1 Message Date
Daniel Preussker
52bf0fad15 Merge pull request #2789 from laf/issue-2761
Updated active directory auth to support dashboards
2016-01-20 19:57:53 +00:00
laf
59a1050df6 Fixed device ip binary decode 2016-01-20 18:19:15 +00:00
laf
c6c3858312 Some more scrut fixes 2016-01-19 22:27:04 +00:00
Mike Rostermund
e021cf8f67 Merge pull request #2801 from wiad/issue-2708
Add infoblox devices (Issue 2708)
2016-01-19 23:00:43 +01:00
laf
2dec9c3996 Rebased (sql schema conflict) 2016-01-19 14:33:15 +00:00
wiad
45e412f64b Merge branch 'master' of https://github.com:/wiad/librenms into issue-2708 2016-01-19 12:03:48 +01:00
Paul Gear
a340f353c2 Merge pull request #2623 from adaniels21487/issue-1650
Device Components.
2016-01-19 20:38:34 +10:00
wiad
913314f831 fix if statement style 2016-01-19 10:59:13 +01:00
wiad
dda947449a fix if statement style 2016-01-19 10:11:11 +01:00
laf
44dc6b652b Fixed scrut issues 2016-01-19 09:04:53 +00:00
laf
3a8b0b053d Rebased includes/common.php 2016-01-19 09:00:18 +00:00
wiad
582c3984e5 Try to find rancid file based on both fqdn and short host name 2016-01-19 10:00:14 +01:00
wiad
086443b77a Merge branch 'master' of https://github.com:/wiad/librenms into issue-2708
Conflicts:
	includes/definitions.inc.php
2016-01-19 09:51:03 +01:00
Daniel Preussker
ded1fa3e73 Merge pull request #2796 from laf/issue-2091
Added config option to force showing sysName instead of IP
2016-01-19 05:34:49 +00:00
wiad
65176c00bd Addes support for infoblox devices 2016-01-18 13:51:39 +01:00
laf
49adff3895 Added the lookup of IP if device hostname is a hostname 2016-01-17 23:59:51 +00:00
laf
5e37de8b65 Added config option to force showing sysName instead of IP 2016-01-17 22:01:09 +00:00
R. Morris
bc4b26e0df LenovoEMC (NAS) - initial code update. 2016-01-17 14:45:53 -06:00
Rosiak
4581366bf4 Add WebUI settings 2016-01-17 19:19:56 +01:00
laf
57c802cd4e Updated active directory auth to support dashboards 2016-01-17 15:26:35 +00:00
Paul Gear
771fc342fd Clear $graph_array after graph is printed 2016-01-17 12:13:45 +10:00
Aaron Daniels
ad751983dc Merge branch 'master' into issue-1650 2016-01-15 17:52:40 +10:00
Aaron Daniels
6492b887e9 Merge branch 'master' of https://github.com/adaniels21487/librenms into issue-1650 2016-01-14 06:10:31 +10:00
Aaron Daniels
87e88dacfd - Compress API filters to a loop
- Check for filters for valid fields
2016-01-14 05:22:37 +10:00
laf
c4ffa423a1 Added suggestion to contribute to stats 2016-01-11 21:03:12 +00:00
Mike Rostermund
44ef2c999e Merge pull request #2745 from laf/issue-2464
Added group support for Oxidized
2016-01-11 20:14:24 +01:00
Rosiak
14ecef76e8 Changed.. 2016-01-11 14:13:16 +01:00
Rosiak
05734803df Fix missing slash if base_url set 2016-01-11 13:14:20 +01:00
Paul Gear
2469621a58 Merge pull request #2746 from laf/issue-2562
Added datetime to notifications + Fixed sticky/unsticky notifications disappearing
2016-01-11 09:01:56 +10:00
Neil Lathwood
d3132a190b Merge pull request #2690 from vitalisator/stp
add basic STP/RSTP support
2016-01-10 22:45:24 +00:00
Neil Lathwood
72cc180184 Merge pull request #2719 from SaaldjorMike/del-utime-func
Replaced custom utime() function with microtime(true)
2016-01-10 22:43:31 +00:00
laf
93b0886567 Added datetime to notifications + Fixed sticky/unsticky notifications disappearing 2016-01-10 22:22:13 +00:00
laf
a35f6d8c7a Added group support for Oxidized 2016-01-10 19:45:54 +00:00
laf
802d0993d9 Removed onClick from ports list 2016-01-10 17:19:58 +00:00
Arjit Chaudhary
68a4acd717 Update device.inc.php 2016-01-10 19:01:59 +05:30
Arjit Chaudhary
3b09f8b955 Update ports.inc.php 2016-01-10 19:01:42 +05:30
Arjit Chaudhary
03051d455f Update apps.inc.php 2016-01-10 19:01:24 +05:30
Arjit Chaudhary
6a652b72fa Update alerts.inc.php 2016-01-10 19:01:08 +05:30
Arjit Chaudhary
659d4e0172 Update alert-rules.inc.php 2016-01-10 19:00:49 +05:30
Arjit Chaudhary
eedc30aae5 Add missing titles/headers 2016-01-10 19:00:04 +05:30
Daniel Preussker
cce8bc5f26 Merge pull request #2697 from laf/versions
Centralised version info + used in output
2016-01-10 13:28:10 +00:00
Daniel Preussker
feb524f0da Merge pull request #2739 from paulgear/dash-typo-fix
Fix typo & clarify location of edit dashboard button
2016-01-10 10:08:44 +00:00
Paul Gear
f123502730 Fix typo & clarify location of edit dashboard button 2016-01-10 15:18:25 +10:00
laf
63444e2f39 Rebased 2016-01-10 00:41:20 +00:00
Arjit Chaudhary
815a3e72e6 Fixes #2724 -- Added mysqli to install.php if PHP 7 2016-01-10 03:23:34 +05:30
nguillaumin
ceb2d15b9d Fixes #2725: Wrong suggestion to install PEAR 2016-01-09 22:50:47 +11:00
Rosiak
730588776e Correction 2016-01-09 00:28:58 +01:00
Rosiak
82a302e135 Fix 2709
#2709
2016-01-09 00:03:09 +01:00
Søren Rosiak
89a22efda3 Merge pull request #2469 from thomseddon/feature/sub10-support 2016-01-08 15:07:01 +01:00
Mike Rostermund
e2d1a8e7d9 Replaced custom utime() function with microtime(true) 2016-01-08 13:33:32 +01:00