aboutsummaryrefslogtreecommitdiffstats
path: root/alfred.py
Commit message (Expand)AuthorAgeFilesLines
* Dies sind die alle aenderungen seit 29.09.2014root2014-12-291-7/+5
* Merge remote-tracking branch 'ffnord/master'ffki-rz root user2014-09-041-1/+1
|\
| * alfred.py: use gzip (requires alfred-json v0.2)Nils Schneider2014-07-051-1/+1
* | Merge remote-tracking branch 'ffnord/master'root2014-06-051-1/+6
|\|
| * bugsNils Schneider2014-05-311-1/+1
| * alfred: use network.mac as ID if presentNils Schneider2014-05-021-0/+5
* | Merge branch 'master' of https://github.com/ffnord/ffmap-backendroot2014-04-241-1/+4
|\|
| * alfred.py: ignore non-parseable locationsNils Schneider2014-03-301-1/+4
* | Merge remote-tracking branch 'tcatm/master'root2014-02-041-0/+6
|\|
| * alfred.py: pass firmware version to nodes.jsonNils Schneider2014-02-021-0/+6
| * alfred: Retrieve aliases from alfred and integrate batadv-vis.Daniel Ehlers2014-01-301-0/+28
* Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-301-16/+1
|\
| * Move code into, abstract codeDaniel Ehlers2014-01-301-16/+1
* | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-301-1/+16
|\|
| * Parse batadv-bis dataDaniel Ehlers2014-01-301-1/+16
* | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-281-4/+5
|\|
| * Change binary to alfred-jsonDaniel Ehlers2014-01-281-4/+5
* | Merge branch 'master' of https://github.com/sargon/ffmap-backendroot2014-01-261-1/+4
|\|
| * alfred: Retrieve aliases from alfredDaniel Ehlers2014-01-261-0/+27
* Fixuproot2014-01-241-1/+1
* alfred: Retrieve aliases from alfredDaniel Ehlers2014-01-241-0/+24