summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-061-0/+47
|\
| * Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-064-10/+70
| |\
| * | util jbo: talk about usagetv2013-11-061-0/+1
| * | util jbo: initial importtv2013-11-061-0/+46
* | | webchat: nick and time displaylassulus2013-11-063-3/+33
* | | webchat: write only ip as namelassulus2013-11-061-1/+1
| |/ |/|
* | Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-061-0/+30
|\ \
| * \ Merge branch 'master' of github.com:krebscode/painloadmakefu2013-11-063-6/+10
| |\ \
| * | | ship/lib/core: add esudo, get_hostnamemakefu2013-11-061-0/+30
* | | | webchat: better layoutlassulus2013-11-063-5/+30
* | | | webchat: border around chatboxlassulus2013-11-061-0/+1
| |/ / |/| |
* | | Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-061-4/+38
|\ \ \ | | |/ | |/|
| * | ship README: untypotv2013-11-061-1/+1
| |/
| * Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-062-14/+35
| |\
| * | ship: talk about Macro Developmenttv2013-11-061-0/+22
| * | ship: talk harder about Make Interfacetv2013-11-061-4/+7
| * | ship: add Quickstart Guidetv2013-11-061-0/+9
* | | webchat: better stylelassulus2013-11-061-3/+7
* | | webchat: renamed name to originlassulus2013-11-061-2/+2
| |/ |/|
* | Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-069-11/+62
|\|
| * ship: mv README{,.markdown}tv2013-11-061-0/+0
| * ship README: talk about make interfacetv2013-11-061-0/+19
| * Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-065-9/+11
| |\
| * | ship: s/deploy/make {,inst}all {,dist}clean/tv2013-11-062-0/+32
| * | ship develop: RIPtv2013-11-061-0/+0
| * | ship: mv bin src && mv out tmptv2013-11-064-6/+6
* | | webchat: now with /nicklassulus2013-11-062-14/+35
| |/ |/|
* | webchat: krebs now as backgroundlassulus2013-11-062-1/+10
* | bling: delete blue krebslassulus2013-11-061-0/+0
* | webchat: better krebslassulus2013-11-063-8/+1
* | webchat: add spaces around hello arrowFelix Richter2013-11-061-1/+1
|/
* ship build: s/macro_*/build_*_macro/gtv2013-11-061-3/+3
* Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-062-3/+5
|\
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-062-32/+25
| |\
| * | webchat: add redis as dependencylassulus2013-11-061-1/+2
| * | webchat: better outputlassulus2013-11-061-2/+3
* | | ship lib: remove crufttv2013-11-064-6/+2
| |/ |/|
* | ship deploy: reduce crufttv2013-11-061-6/+5
* | Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-063-9/+20
|\|
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-061-46/+56
| |\
| * | better csslassulus2013-11-061-3/+8
| * | webchat: clickable linkslassulus2013-11-061-3/+9
| * | webchat: move stuff to local_configlassulus2013-11-061-3/+3
* | | ship build: s/directive/macro/gtv2013-11-061-26/+20
| |/ |/|
* | Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-063-2/+20
|\|
| * webchat: local_config in .gitignorelassulus2013-11-061-0/+2
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-067-33/+142
| |\
| * | webchat: fix package.jsonlassulus2013-11-061-1/+1
| * | webchat: automatic reconnect after ping timeoutlassulus2013-11-061-1/+17
* | | ship build: load directives before build_depstv2013-11-061-8/+10