laf 851b7eb46f Fixed merge conflict

2015-06-09 14:36:45 +01:00

..

apps

…

bill

…

bills

…

device

Fixed merge conflict

2015-06-09 14:36:45 +01:00

front

…

health

Merge branch 'issue-laf-110-new' of git://github.com/laf/librenms into laf-issue-laf-110-new

2015-06-07 10:44:39 +00:00

plugin

…

pollers

…

ports

…

routing

Webui updates for BGP

2015-06-09 14:30:31 +01:00

search

…

settings

…

.htaccess

…

about.inc.php

…

addhost.inc.php

…

addsrv.inc.php

…

adduser.inc.php

…

alert-log.inc.php

Minor name changes

2015-06-02 19:42:08 +02:00

alert-map.inc.php

…

alert-rules.inc.php

…

alert-schedule.inc.php

…

alert-stats.inc.php

…

alerts.inc.php

…

api-access.inc.php

…

api-docs.inc.php

…

apps.inc.php

…

authlog.inc.php

…

bill.inc.php

…

bills.inc.php

Fixed percentagebar on /bills/

2015-06-08 12:52:38 +02:00

configuration.inc.php

…

customers.inc.php

…

deleted-ports.inc.php

…

delhost.inc.php

…

delsrv.inc.php

…

deluser.inc.php

…

device-groups.inc.php

…

device.inc.php

…

devices.inc.php

…

editsrv.inc.php

…

edituser.inc.php

…

eventlog.inc.php

…

graphs.inc.php

…

health.inc.php

Merge pull request #1186 from SaaldjorMike/dbm-link

2015-06-02 19:22:05 +01:00

iftype.inc.php

…

inventory.inc.php

…

locations.inc.php

…

logon.inc.php

…

map.inc.php

…

packages.inc.php

…

plugin.inc.php

…

poll-log.inc.php

…

pollers.inc.php

…

ports.inc.php

…

preferences.inc.php

…

pseudowires.inc.php

…

public.inc.php

…

purgeports.inc.php

…

routing.inc.php

…

search.inc.php

…

services.inc.php

…

settings.inc.php

…

syslog.inc.php

Fixed same height for input fields on /syslog/

2015-06-04 12:27:49 +02:00

templates.inc.php

…