aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Fixed variable name and catches only KeyErrors to not hide other errors.Andreas Baldeau2014-01-311-2/+3
| | * Fixes client mac obfuscation. Node to node links stay untouched now.Andreas Baldeau2014-01-311-0/+6
| |/
| * Merge pull request #14 from sargon/masterNils Schneider2014-01-305-8/+68
| |\
* | | Fix double callroot2014-01-311-3/+1
* | | Fix crontabroot2014-01-301-1/+1
* | | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-301-1/+1
|\ \ \ | | |/ | |/|
| * | alfred: Make the alfred based batadv-vis data source optional.Daniel Ehlers2014-01-302-4/+7
| * | rrd: Only decrease client count for legacy nodes.Daniel Ehlers2014-01-301-1/+2
* | | Merge branch 'experimental' of https://github.com/sargon/ffmap-backendroot2014-01-303-5/+13
|\ \ \
| * | | alfred: Make the alfred based batadv-vis data source optional.Daniel Ehlers2014-01-302-4/+7
| * | | rrd: Only decrease client count for legacy nodes.Daniel Ehlers2014-01-301-1/+2
| |/ /
| * | alfred: Mark all nodes from legacy support.Daniel Ehlers2014-01-302-1/+8
| * | alfred: Retrieve aliases from alfred and integrate batadv-vis.Daniel Ehlers2014-01-303-4/+53
* | | Merge branch 'experimental' of https://github.com/sargon/ffmap-backendroot2014-01-302-1/+3
|\ \ \
| * | | Get all legacy nodesDaniel Ehlers2014-01-302-1/+3
* | | | Merge branch 'experimental' of https://github.com/sargon/ffmap-backendroot2014-01-301-1/+1
|\ \ \ \ | |/ / /
| * | | Change order of vis dataDaniel Ehlers2014-01-301-1/+1
* | | | Merge branch 'experimental' of https://github.com/sargon/ffmap-backendroot2014-01-301-1/+1
|\ \ \ \ | |/ / /
| * | | FixupDaniel Ehlers2014-01-301-1/+1
* | | | Merge branch 'experimental' of https://github.com/sargon/ffmap-backendroot2014-01-302-2/+2
|\ \ \ \ | |/ / /
| * | | FixupDaniel Ehlers2014-01-302-2/+2
* | | | Merge branch 'experimental' of https://github.com/sargon/ffmap-backendroot2014-01-302-1/+6
|\ \ \ \ | |/ / /
| * | | Mark legacy nodesDaniel Ehlers2014-01-302-1/+6
* | | | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-301-0/+4
|\ \ \ \ | |/ / /
| * | | alfred: Retrieve aliases from alfred and integrate batadv-vis.Daniel Ehlers2014-01-303-4/+53
| | |/ | |/|
* | | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-303-30/+20
|\ \ \
| * | | Move code into, abstract codeDaniel Ehlers2014-01-303-30/+20
* | | | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-301-2/+4
|\ \ \ \ | |/ / /
| * | | Move codeDaniel Ehlers2014-01-301-2/+4
| * | | Merge branch 'master' of github.com:sargon/ffmap-backendDaniel Ehlers2014-01-301-13/+12
| |\ \ \
| * \ \ \ Merge branch 'master' of git://github.com/tcatm/ffmap-backendDaniel Ehlers2014-01-300-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-301-13/+12
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge vis_data before the node db parsing callDaniel Ehlers2014-01-301-13/+12
| |/ / /
* | | | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-302-3/+25
|\ \ \ \ | |/ / /
| * | | Parse batadv-bis dataDaniel Ehlers2014-01-302-3/+25
* | | | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-281-4/+5
|\ \ \ \ | |/ / /
| * | | Change binary to alfred-jsonDaniel Ehlers2014-01-281-4/+5
* | | | Local Fixuproot2014-01-261-4/+0
* | | | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-262-1/+8
|\ \ \ \ | |/ / /
| * | | alfred: Retrieve aliases from alfredDaniel Ehlers2014-01-262-0/+35
| * | | Write new file to a temporary and move it afterwards.Daniel Ehlers2014-01-261-1/+5
| * | | Fix exception handling and remove debug outputDaniel Ehlers2014-01-261-6/+3
* | | | Fixuproot2014-01-241-1/+1
* | | | Fixuproot2014-01-241-5/+0
* | | | Merge remote-tracking branch 'sargon/master'root2014-01-246-8/+161
|\ \ \ \
| * | | | alfred: Retrieve aliases from alfredDaniel Ehlers2014-01-242-0/+32
| | |/ / | |/| |
| * | | Merge pull request #11 from toppoint/obscure-clientsNils Schneider2014-01-042-7/+8
| |\ \ \ | | |/ / | |/| / | | |/
| | * Write new file to a temporary and move it afterwards.Daniel Ehlers2014-01-021-1/+5
| | * Fix exception handling and remove debug outputDaniel Ehlers2013-12-291-6/+3
| * | Merge pull request #10 from toppoint/obscure-clientsNils Schneider2013-12-292-0/+76
| |\ \ | | |/