Jakob Borg 9dda7485eb Merge branch 'pr/871' ...

* pr/871:
  Slight increase of contrast in identicons
  Implement identicon representation for devices.

Conflicts:
	internal/auto/gui.files.go

2014-10-17 09:29:06 +02:00

..

auto

Merge branch 'pr/871'

2014-10-17 09:29:06 +02:00

beacon

Relicense to GPL

2014-10-01 07:53:59 +02:00

config

Best attempt when creating a folder marker (fixes #857)

2014-10-15 10:20:40 +01:00

discover

Make cacheEntry public so that it can be marshalled to the UI.

2014-10-15 21:52:06 +01:00

events

Minor fixes.

2014-10-06 23:03:24 +01:00

files

Populate BlockMap

2014-10-16 12:26:27 +02:00

fnmatch

Relicense to GPL

2014-10-01 07:53:59 +02:00

ignore

Revert and replace 31d95ac, 65acc7c, 87780a5

2014-10-14 21:35:30 +01:00

lamport

Relicense to GPL

2014-10-01 07:53:59 +02:00

logger

Relicense to GPL

2014-10-01 07:53:59 +02:00

luhn

Relicense to GPL

2014-10-01 07:53:59 +02:00

model

Don't log inscrutable 'recovered: leveldb: not found' to web GUI

2014-10-16 13:45:42 +02:00

osutil

Use a configuration wrapper to handle loads and saves

2014-10-06 17:57:35 +02:00

protocol

Implement BlockMap

2014-10-16 12:26:27 +02:00

scanner

Add a few more debug prints

2014-10-16 12:12:54 +02:00

stats

Relicense to GPL

2014-10-01 07:53:59 +02:00

upgrade

Relicense to GPL

2014-10-01 07:53:59 +02:00

upnp

Remove out of date upnp tests

2014-10-16 12:12:59 +02:00

versioner

only convert maxAge from days to seconds once

2014-10-11 21:18:16 +02:00