summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'enklave/master'lassulus2019-08-134-205/+20
|\
| * Merge branch 'master' of prism.r:stockholmjeschli2019-08-067-4/+54
| |\
| * \ Merge branch 'master' of prism.r:stockholmjeschli2019-07-1622-7/+1493
| |\ \
| * | | j bolide: add nygma toolchainjeschli2019-06-301-1/+3
| * | | j bolide: remove home-managerjeschli2019-06-302-190/+3
| * | | j bolide: enable broadcom drivers for wifijeschli2019-06-301-0/+1
| * | | j brauerei: add aspell, ispell for spacemacsjeschli2019-06-301-0/+2
| * | | j brauerei: add c++ toolchain for nygmajeschli2019-06-301-1/+3
| * | | j brauerei: add unstable as sourcejeschli2019-06-301-0/+1
| * | | j krops: add unstable channeljeschli2019-06-301-0/+4
| * | | Merge branch 'master' of prism.r:stockholmjeschli2019-06-2569-628/+1179
| |\ \ \
| * | | | j brauerei: -python35 +python37jeschli2019-06-101-13/+3
| * | | | Merge branch 'master' of prism.r:stockholmjeschli2019-05-287-9/+232
| |\ \ \ \
* | \ \ \ \ Merge remote-tracking branch 'gum/master'lassulus2019-08-1355-454/+1602
|\ \ \ \ \ \
| * | | | | | ma bureautomation/10h timer: add hello and too-long quotesmakefu2019-07-171-7/+15
| * | | | | | ma bureautomation: home-assistant disable testsmakefu2019-07-171-0/+3
| * | | | | | shack/powerraw: send stats to influx as wellmakefu2019-07-171-3/+34
| * | | | | | shack/mqtt: update permissionsmakefu2019-07-172-3/+10
| * | | | | | nixpkgs: d77e3bd -> 973a270makefu2019-07-171-3/+3
| * | | | | | Merge branch 'master' of ssh.git.shackspace.de:rz/stockholmmakefu2019-07-171-5/+0
| |\ \ \ \ \ \
| | * | | | | | wolf.r: remove openhab-ipulrich2019-07-171-5/+0
| * | | | | | | wolf.r: enable powerrawmakefu2019-07-171-0/+2
| * | | | | | | shack/powerraw: initmakefu2019-07-171-0/+41
| * | | | | | | shack/s3-power: update revisionmakefu2019-07-173-2/+18
| |/ / / / / /
| * | | | | | wolf.r: also use openhab ip addressmakefu2019-07-161-4/+11
| * | | | | | shack/s3-power: use one-shot versionmakefu2019-07-161-4/+4
| * | | | | | shack/muellshack,node-light: fix pathsmakefu2019-07-162-3/+3
| * | | | | | 0tests: add shack/s3-power.jsonmakefu2019-07-161-0/+1
| * | | | | | wolf.r: enable s3-powermakefu2019-07-161-0/+2
| * | | | | | shack/muell_mail,s3-power: update commitsmakefu2019-07-152-2/+35
| * | | | | | wolf.r: configure muell_mailmakefu2019-07-121-0/+2
| * | | | | | shack/muell_mail: initmakefu2019-07-122-0/+33
| * | | | | | wolf.r: deploy node-lightmakefu2019-07-111-0/+2
| * | | | | | shack/node-light: initmakefu2019-07-111-0/+53
| * | | | | | shack/muellshack: make storage.json writeablemakefu2019-07-111-0/+1
| * | | | | | wolf.r: enable muellshackmakefu2019-07-111-0/+2
| * | | | | | shack/gitlab-runner: docker.restartIfChanged = falsemakefu2019-07-111-4/+1
| * | | | | | shack/muellshack: initmakefu2019-07-111-0/+42
| * | | | | | ma bureautomation: split schlechteluft in 2 automations (long and short)makefu2019-07-091-4/+41
| * | | | | | gitlab-ci: only run deploy on changes in krebsmakefu2019-07-081-0/+9
| * | | | | | wolf.r: enable remote deploymentmakefu2019-07-081-0/+1
| * | | | | | gitlab-ci: remove test codemakefu2019-07-081-2/+0
| * | | | | | krebs/krops.nix: add targetmakefu2019-07-081-2/+2
| * | | | | | shack/gitlab-runner: do not restart service on changemakefu2019-07-082-2/+6
| * | | | | | gitlab-ci: use wolf.shack as targetmakefu2019-07-081-1/+3
| * | | | | | puyak.r: enable gitlab-runnermakefu2019-07-071-0/+4
| * | | | | | shack/gitlab-ci: enable graceful shutdownmakefu2019-07-071-5/+8
| * | | | | | gitlab-ci: add git submodule checkoutmakefu2019-07-071-0/+2
| * | | | | | gitlab-ci: use correct directory for testmakefu2019-07-071-1/+1
| * | | | | | gitlab-ci: test and deploy wolfmakefu2019-07-071-0/+6