f0o 3be0b85846 Resolved upstream-conflicts: ...

html/pages/apps.inc.php
	includes/polling/unix-agent.inc.php

2015-01-18 06:37:22 +00:00

..

apps

…

bill

…

bills

…

device

Resolved upstream-conflicts:

2015-01-18 06:37:22 +00:00

front

…

health

…

plugin

…

ports

…

routing

…

search

Replace Packages-link in menubar with Packages-Search.

2015-01-07 09:22:39 +00:00

.htaccess

…

about.inc.php

…

addhost.inc.php

…

addsrv.inc.php

…

adduser.inc.php

…

alert-rules.inc.php

…

alerts.inc.php

…

api-access.inc.php

…

api-docs.inc.php

…

apps.inc.php

Resolved upstream-conflicts:

2015-01-18 06:37:22 +00:00

authlog.inc.php

…

bill.inc.php

…

bills.inc.php

…

configuration.inc.php

…

customers.inc.php

…

deleted-ports.inc.php

…

delhost.inc.php

…

delsrv.inc.php

…

deluser.inc.php

…

device.inc.php

Added:

2015-01-15 07:18:10 +00:00

devices.inc.php

…

edituser.inc.php

…

eventlog.inc.php

…

graphs.inc.php

…

health.inc.php

…

iftype.inc.php

…

inventory.inc.php

…

locations.inc.php

…

logon.inc.php

Added remember me text

2015-01-03 20:01:29 +00:00

packages.inc.php

…

plugin.inc.php

…

ports.inc.php

Removed bogus and buggy Memcached reference from html/pages/ports.inc.php to avoid duplicates.

2015-01-07 15:34:14 +00:00

preferences.inc.php

…

pseudowires.inc.php

…

public.inc.php

…

purgeports.inc.php

…

routing.inc.php

…

search.inc.php

Replace Packages-link in menubar with Packages-Search.

2015-01-07 09:22:39 +00:00

services.inc.php

…

settings.inc.php

Added nested table to represent $config in Global Settings page /settings

2015-01-10 07:28:40 +00:00

syslog.inc.php

…

templates.inc.php

…