summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/krebscode/painloadmakefu2014-05-053-1/+23
|\
| * add foobar (ttb)lassulus2014-05-041-0/+11
| * hosts: add kaepselelassulus2014-05-031-0/+11
| * tinc-install: fix typolassulus2014-05-031-1/+1
* | Merge all the shitsmakefu2014-05-058-6/+9
* | Merge branch 'master' of https://github.com/krebscode/painloadmakefu2014-04-2911-15/+44
|\|
| * update thingsmakefu2014-04-2710-14/+43
| * Merge branch 'master' of ssh://github.com/krebscode/painloadmakefu2014-04-2710-51/+125
| |\
| * | make systemd Reaktor file less variablemakefu2014-04-271-1/+1
* | | bootstrap_env: fix duplicate vimrc linemakefu2014-04-281-1/+0
| |/ |/|
* | fix ranking in highestmakefu2014-04-251-4/+12
* | add highest for titlebotmakefu2014-04-253-2/+25
* | make exceptions more clearmakefu2014-04-253-10/+20
* | add fallback for non existing directorymakefu2014-04-251-1/+4
* | Merge branch 'master' of https://github.com/krebscode/painloadmakefu2014-04-253-15/+23
|\ \
| * | reaktor commands caps: fix typotv2014-04-251-1/+1
| * | reaktor config: introduce simple_commandtv2014-04-251-7/+12
| * | reaktor config: identify needs config_filenametv2014-04-251-1/+5
| * | reaktor config: tell is a default_commandtv2014-04-251-9/+7
* | | update titlebot configmakefu2014-04-251-9/+20
* | | fix {} in default_command functionmakefu2014-04-251-3/+4
* | | Merge branch 'master' of https://github.com/krebscode/painloadmakefu2014-04-254-19/+29
|\| |
| * | reaktor: move config_filename to configtv2014-04-252-5/+10
| * | reaktor config: unify ^(<name>|*):tv2014-04-251-7/+8
| * | reaktor: name must not be able to kill patternstv2014-04-251-5/+9
| * | reaktor config: use expanduser instead of environtv2014-04-251-2/+2
| * | Merge branch 'master' of github:krebscode/painloadtv2014-04-252-10/+10
| |\|
| * | reaktor getconf: allow default_valuetv2014-04-253-7/+7
* | | Merge branch 'master' of https://github.com/krebscode/painloadmakefu2014-04-252-10/+10
|\ \ \ | | |/ | |/|
| * | Reaktor:fix ^makefu2014-04-252-10/+10
| |/
* / add ^makefu2014-04-251-1/+1
|/
* add titlebot Reaktor configurationmakefu2014-04-259-0/+211
* Merge branch 'master' of ssh://github.com/krebscode/painloadmakefu2014-04-2510-10/+17
|\
| * fixed hosts in install scriptlassulus2014-04-221-2/+2
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2014-04-211-0/+1
| |\
| | * matz pubkey addedmatz2014-04-211-0/+1
| * | tinc_install: abort on - in hostnamelassulus2014-04-211-0/+5
| |/
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2014-04-214-8/+5
| |\
| | * retiolum/bin/hosts: osx doesn't know \ttv2014-04-201-1/+1
| | * retiolum/bin/hosts: \? is not BREtv2014-04-201-2/+2
| | * update-retiolum-hosts: remove readlinktv2014-04-201-1/+1
| | * update_tinc_host: kill readlinktv2014-04-202-5/+2
| * | add keydir to painloadlassulus2014-04-214-0/+4
| |/
* / make config file a parametermakefu2014-04-253-22/+32
|/
* retiolum/hosts: add deitv2014-04-201-0/+11
* reaktor.py: add on_join hook: tell NICK MSG...tv2014-04-204-1/+56
* reaktor.py: allow per-command environmenttv2014-04-201-1/+1
* reaktor.py: set cwdtv2014-04-202-1/+6
* Merge branch 'master' of ssh://github.com/krebscode/painloadmakefu2014-04-202-1/+17
|\
| * add x2makefu2014-04-171-0/+11