summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tinc_stats: fix missing has_keymakefu2014-01-141-1/+1
* adv_graphgen: fix graphviz error with centermakefu2014-01-141-1/+1
* tinc_stats: make Graph.py future compatiblemakefu2014-01-141-18/+17
* adv_graphgen: add usage, this should clear some things upmakefu2014-01-141-0/+27
* tinc_stats: Log2JSON is now working under py3k and py2makefu2014-01-141-9/+8
* add first sites entry for painloadmakefu2014-01-141-0/+98
* fix docker deploy timeoutmakefu2014-01-141-1/+1
* Merge branch 'master' of ssh://github.com/krebscode/painloadmakefu2014-01-146-189/+240
|\
| * reaktor: ircasy invite handlerlassulus2014-01-141-0/+6
| * reaktor: send JOIN after MOTDlassulus2014-01-141-4/+9
| * reaktor: disconnect functionlassulus2014-01-141-0/+4
| * reaktor: reflect changes of api in reaktor codelassulus2014-01-142-4/+3
| * reaktor: refactor ircasy for more encapsulationlassulus2014-01-131-23/+49
| * reaktor: refactor code for moar abstractionlassulus2014-01-133-83/+98
| * new_install: $NAME in tinc-up fixedlassulus2014-01-131-4/+2
| * tinc-up: no need to get namelassulus2014-01-131-4/+2
* | tinc_stats: make graph generation future compatiblemakefu2014-01-142-2/+2
* | adv_graphgen: remove legacy variablesmakefu2014-01-143-6/+0
* | tinc_stats: remove Graphite codemakefu2014-01-143-34/+0
* | tinc_stats: remove legacy code from Log2JSONmakefu2014-01-141-41/+1
|/
* Merge branch 'master' of ssh://github.com/krebscode/painloadmakefu2014-01-126-93/+176
|\
| * news: fix addlassulus2014-01-111-1/+1
| * news: more sanity!lassulus2014-01-111-1/+1
| * news: fix missing newlinelassulus2014-01-111-1/+1
| * news: check for existing namelassulus2014-01-111-4/+7
| * news: action instead of send from controllerlassulus2014-01-111-1/+1
| * news: fix controller exit, show rss urllassulus2014-01-101-1/+2
| * news: new command uptimelassulus2014-01-101-0/+4
| * ircbot: fix savelassulus2014-01-101-1/+1
| * rename knn to news :(lassulus2014-01-105-0/+0
| * knn: new feedslassulus2014-01-101-45/+99
| * rename ircbot to knn (krebs news network)lassulus2014-01-095-0/+0
| * ircbos: saving only running botslassulus2014-01-091-1/+2
| * ircbot: maybe this?lassulus2014-01-091-0/+1
| * ircbot: maybe this will worklassulus2014-01-091-0/+1
| * ircbot: stop retrying after 20 failslassulus2014-01-091-0/+5
| * ircbot: fix empty first arg buglassulus2014-01-091-1/+1
| * ircbot: better loopinglassulus2014-01-091-24/+28
| * ircbot: search commandlassulus2014-01-091-8/+5
| * ircbot: shortenurl functionlassulus2014-01-092-3/+15
* | krebsgold: affiliatefox remove all the backdoorsmakefu2014-01-121-0/+0
* | bigeye: prepare to become submodulemakefu2014-01-091-0/+9
|/
* Merge branch 'master' of ssh://github.com/krebscode/painloadmakefu2014-01-087-41/+16
|\
| * ircbot: manual add now with sys url_shortenerlassulus2014-01-081-1/+1
| * ircbot: fix cr in urllassulus2014-01-071-1/+1
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2014-01-072-10/+9
| |\
| | * Merge branch 'master' of https://github.com/krebscode/painloadroot2014-01-073-4/+2
| | |\
| | * | go:t/docker fix CR in regexroot2014-01-072-10/+9
| * | | ircbot: fix newline in urllassulus2014-01-071-1/+1
| | |/ | |/|
| * | Merge branch 'master' of github.com:krebscode/painloadlassulus2014-01-073-28/+4
| |\ \