Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update aliases.json so that the graph knows who has vpn linksHEADmaster | Wilfried Klaebe | 2015-03-26 | 1 | -0/+2 |
| | |||||
* | Dies sind die alle aenderungen seit 29.09.2014 | root | 2014-12-29 | 6 | -55/+62 |
| | | | | das ist nicht gut, bitte immer alle kleinen aenderungen zumindest lokal committen! | ||||
* | Umbauten | ffki-rz root user | 2014-09-29 | 6 | -16/+18 |
| | |||||
* | Merge remote-tracking branch 'ffnord/master' | ffki-rz root user | 2014-09-04 | 9 | -184/+80 |
|\ | |||||
| * | RRD: Fix updating of DS | Jan-Philipp Litza | 2014-08-17 | 1 | -12/+5 |
| | | |||||
| * | rename rrd.py to rrddb.py | Nils Schneider | 2014-08-17 | 2 | -1/+1 |
| | | |||||
| * | fix rrd.py for real | Nils Schneider | 2014-08-17 | 1 | -3/+3 |
| | | |||||
| * | remove fuzzy matching | Nils Schneider | 2014-08-17 | 1 | -17/+4 |
| | | |||||
| * | fix rrd | Nils Schneider | 2014-08-17 | 4 | -24/+2 |
| | | |||||
| * | count clients, instead of nodes | Nils Schneider | 2014-08-17 | 4 | -121/+18 |
| | | |||||
| * | Revert "remove fuzzy matching" | Nils Schneider | 2014-08-12 | 1 | -4/+90 |
| | | | | | | | | This reverts commit a88b207cf12f6fd12c5701aa7b54a79eb590c76f. | ||||
| * | remove fuzzy matching | Nils Schneider | 2014-08-10 | 1 | -90/+4 |
| | | |||||
| * | alfred.py: use gzip (requires alfred-json v0.2) | Nils Schneider | 2014-07-05 | 1 | -1/+1 |
| | | |||||
| * | persistent state (mostly for gluon nodes), prune after 30d | Nils Schneider | 2014-06-29 | 3 | -2/+56 |
| | | |||||
| * | remove dead code | Nils Schneider | 2014-06-29 | 1 | -13/+0 |
| | | |||||
* | | just commit current status | ffki-rz root user | 2014-08-23 | 5 | -11/+3 |
| | | |||||
* | | Merge remote-tracking branch 'ffnord/master' | root | 2014-07-04 | 1 | -1/+53 |
|\ \ | |/ | |||||
| * | Merge pull request #28 from smoe/patch-1 | Nils Schneider | 2014-06-21 | 1 | -1/+53 |
| |\ | | | | | | | Patch 1 - install instructions | ||||
| | * | Syntax | Steffen Möller | 2014-06-21 | 1 | -1/+3 |
| | | | |||||
| | * | Explained execution of mkmap.sh and crontab | Steffen Möller | 2014-06-21 | 1 | -1/+13 |
| | | | | | | | | | Also improved markdown formatting ... slightly. | ||||
| | * | Basic install instructions | Steffen Möller | 2014-06-21 | 1 | -1/+39 |
| |/ | |||||
* | | deactivate import of fastd keys from wiki | root | 2014-06-05 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'ffnord/master' | root | 2014-06-05 | 4 | -8/+22 |
|\ \ | |/ | | | | | | | Conflicts: .gitignore | ||||
| * | bugs | Nils Schneider | 2014-05-31 | 5 | -3/+7 |
| | | |||||
| * | alfred: use network.mac as ID if present | Nils Schneider | 2014-05-02 | 2 | -0/+8 |
| | | |||||
| * | Merge pull request #26 from T-X/for-upstream | Nils Schneider | 2014-05-02 | 1 | -5/+8 |
| |\ | | | | | | | try non-fuzzy prior fuzzy mac matching | ||||
| | * | try non-fuzzy prior fuzzy mac matching | Linus Lüssing | 2014-05-02 | 1 | -5/+8 |
| |/ | | | | | | | | | Fuzzy matching should only be tried if there's no exact match. Otherwise a node in the map might get the wrong label. | ||||
* | | Merge branch 'master' of https://github.com/ffnord/ffmap-backend | root | 2014-04-24 | 9 | -94/+474 |
|\ \ | |/ | | | | | | | Conflicts: rrd.py | ||||
| * | count clients and add clientcount attribute to each node | Nils Schneider | 2014-04-10 | 4 | -1/+24 |
| | | |||||
| * | alfred.py: ignore non-parseable locations | Nils Schneider | 2014-03-30 | 1 | -1/+4 |
| | | |||||
| * | Merge pull request #20 from FreifunkBremen/RRD-module | Nils Schneider | 2014-02-21 | 4 | -93/+446 |
| |\ | | | | | | | RRD module | ||||
| | * | Modularize global and node rrd definitions and graphings | Jan-Philipp Litza | 2014-02-16 | 3 | -76/+103 |
| | | | |||||
| | * | Offload rrdtool calls and model to separate module | Jan-Philipp Litza | 2014-02-16 | 2 | -46/+372 |
| |/ | |||||
* | | Merge remote-tracking branch 'ffnord/master' | root | 2014-02-15 | 3 | -23/+23 |
|\ \ | |/ | | | | | | | | | Conflicts: bat2nodes.py mkmap.sh | ||||
| * | rrd: do not define RRAs twice | Nils Schneider | 2014-02-11 | 1 | -8/+0 |
| | | |||||
| * | bat2nodes: deal with rrd after creating nodes.json | Nils Schneider | 2014-02-11 | 1 | -4/+4 |
| | | |||||
| * | rrd: fixes | Nils Schneider | 2014-02-11 | 1 | -9/+9 |
| | | |||||
| * | rrd: saner RRAs for global | Nils Schneider | 2014-02-11 | 1 | -2/+2 |
| | | |||||
| * | rrd: saner RRAs | Nils Schneider | 2014-02-11 | 1 | -4/+10 |
| | | |||||
| * | rrd.py: remove unused argument | Nils Schneider | 2014-02-09 | 1 | -2/+2 |
| | | |||||
| * | mkmap.sh: enable alfred | Nils Schneider | 2014-02-07 | 1 | -1/+1 |
| | | |||||
| * | mkmap.sh: $GWS was not set | Nils Schneider | 2014-02-07 | 1 | -1/+1 |
| | | |||||
| * | mkmap.sh: cd into directory instead of dirname everywhere | Nils Schneider | 2014-02-07 | 1 | -3/+5 |
| | | |||||
| * | Merge pull request #16 from sargon/optimize-nodedb-py | Nils Schneider | 2014-02-04 | 1 | -0/+3 |
| |\ | | | | | | | nodedb.py: stop similar mac address check when parts are not equal | ||||
* | | | Remove debug output | root | 2014-02-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'sargon/optimize-nodedb-py' | root | 2014-02-04 | 1 | -0/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | nodedb.py: stop similar mac address check when parts are not equal | Daniel Ehlers | 2014-02-04 | 1 | -0/+3 |
| |/ | |||||
* | | Merge remote-tracking branch 'tcatm/master' | root | 2014-02-04 | 4 | -2/+20 |
|\ \ | |/ | |||||
| * | alfred.py: pass firmware version to nodes.json | Nils Schneider | 2014-02-02 | 4 | -0/+11 |
| | | |||||
| * | Merge pull request #15 from freifunkhamburg/obfuscation-fixes | Nils Schneider | 2014-02-01 | 1 | -2/+9 |
| |\ | | | | | | | Obfuscation fixes |