aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update aliases.json so that the graph knows who has vpn linksHEADmasterWilfried Klaebe2015-03-261-0/+2
* Dies sind die alle aenderungen seit 29.09.2014root2014-12-296-55/+62
* Umbautenffki-rz root user2014-09-296-16/+18
* Merge remote-tracking branch 'ffnord/master'ffki-rz root user2014-09-049-184/+80
|\
| * RRD: Fix updating of DSJan-Philipp Litza2014-08-171-12/+5
| * rename rrd.py to rrddb.pyNils Schneider2014-08-172-1/+1
| * fix rrd.py for realNils Schneider2014-08-171-3/+3
| * remove fuzzy matchingNils Schneider2014-08-171-17/+4
| * fix rrdNils Schneider2014-08-174-24/+2
| * count clients, instead of nodesNils Schneider2014-08-174-121/+18
| * Revert "remove fuzzy matching"Nils Schneider2014-08-121-4/+90
| * remove fuzzy matchingNils Schneider2014-08-101-90/+4
| * alfred.py: use gzip (requires alfred-json v0.2)Nils Schneider2014-07-051-1/+1
| * persistent state (mostly for gluon nodes), prune after 30dNils Schneider2014-06-293-2/+56
| * remove dead codeNils Schneider2014-06-291-13/+0
* | just commit current statusffki-rz root user2014-08-235-11/+3
* | Merge remote-tracking branch 'ffnord/master'root2014-07-031-1/+53
|\ \ | |/
| * Merge pull request #28 from smoe/patch-1Nils Schneider2014-06-211-1/+53
| |\
| | * SyntaxSteffen Möller2014-06-211-1/+3
| | * Explained execution of mkmap.sh and crontabSteffen Möller2014-06-211-1/+13
| | * Basic install instructionsSteffen Möller2014-06-211-1/+39
| |/
* | deactivate import of fastd keys from wikiroot2014-06-051-2/+2
* | Merge remote-tracking branch 'ffnord/master'root2014-06-054-8/+22
|\ \ | |/
| * bugsNils Schneider2014-05-315-3/+7
| * alfred: use network.mac as ID if presentNils Schneider2014-05-022-0/+8
| * Merge pull request #26 from T-X/for-upstreamNils Schneider2014-05-021-5/+8
| |\
| | * try non-fuzzy prior fuzzy mac matchingLinus Lüssing2014-05-021-5/+8
| |/
* | Merge branch 'master' of https://github.com/ffnord/ffmap-backendroot2014-04-239-94/+474
|\ \ | |/
| * count clients and add clientcount attribute to each nodeNils Schneider2014-04-104-1/+24
| * alfred.py: ignore non-parseable locationsNils Schneider2014-03-301-1/+4
| * Merge pull request #20 from FreifunkBremen/RRD-moduleNils Schneider2014-02-214-93/+446
| |\
| | * Modularize global and node rrd definitions and graphingsJan-Philipp Litza2014-02-163-76/+103
| | * Offload rrdtool calls and model to separate moduleJan-Philipp Litza2014-02-162-46/+372
| |/
* | Merge remote-tracking branch 'ffnord/master'root2014-02-153-23/+23
|\ \ | |/
| * rrd: do not define RRAs twiceNils Schneider2014-02-111-8/+0
| * bat2nodes: deal with rrd after creating nodes.jsonNils Schneider2014-02-111-4/+4
| * rrd: fixesNils Schneider2014-02-111-9/+9
| * rrd: saner RRAs for globalNils Schneider2014-02-111-2/+2
| * rrd: saner RRAsNils Schneider2014-02-111-4/+10
| * rrd.py: remove unused argumentNils Schneider2014-02-091-2/+2
| * mkmap.sh: enable alfredNils Schneider2014-02-071-1/+1
| * mkmap.sh: $GWS was not setNils Schneider2014-02-071-1/+1
| * mkmap.sh: cd into directory instead of dirname everywhereNils Schneider2014-02-071-3/+5
| * Merge pull request #16 from sargon/optimize-nodedb-pyNils Schneider2014-02-041-0/+3
| |\
* | | Remove debug outputroot2014-02-151-1/+1
* | | Merge remote-tracking branch 'sargon/optimize-nodedb-py'root2014-02-041-0/+3
|\ \ \ | | |/ | |/|
| * | nodedb.py: stop similar mac address check when parts are not equalDaniel Ehlers2014-02-041-0/+3
| |/
* | Merge remote-tracking branch 'tcatm/master'root2014-02-044-2/+20
|\ \ | |/
| * alfred.py: pass firmware version to nodes.jsonNils Schneider2014-02-024-0/+11
| * Merge pull request #15 from freifunkhamburg/obfuscation-fixesNils Schneider2014-02-021-2/+9
| |\