Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into HEAD | jeschli | 2018-03-13 | 23 | -115/+289 |
|\ | |||||
| * | l xephyrify: add minimal xmonad | lassulus | 2018-03-06 | 1 | -2/+35 |
| * | Merge remote-tracking branch 'ni/master' | lassulus | 2018-03-06 | 1 | -0/+1 |
| |\ | |||||
| | * | Merge remote-tracking branch 'prism/master' | tv | 2018-02-28 | 31 | -229/+245 |
| | |\ | |||||
| * | \ | Merge remote-tracking branch 'gum/master' | lassulus | 2018-03-06 | 1 | -5/+45 |
| |\ \ \ | |||||
| | * | | | ma owncloud: add caching | makefu | 2018-02-28 | 1 | -5/+45 |
| * | | | | Merge remote-tracking branch 'prism/tv'prism/staging/tv | lassulus | 2018-03-06 | 14 | -66/+115 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | tv gitrepos: add kops | tv | 2018-02-28 | 1 | -0/+3 |
| | * | | | urlwatch: 2.7 -> 2.8 | tv | 2018-02-28 | 1 | -2/+2 |
| | * | | | os-release: use <stockholm-version> | tv | 2018-02-28 | 9 | -3/+47 |
| | * | | | populate: 2.1.0 -> 2.3.0 | tv | 2018-02-28 | 2 | -2/+17 |
| | * | | | types: refactor source | tv | 2018-02-28 | 2 | -60/+48 |
| * | | | | l mail: add more mailboxes | lassulus | 2018-03-03 | 1 | -4/+30 |
| * | | | | l: add more mails | lassulus | 2018-03-03 | 1 | -1/+9 |
| * | | | | l: add xephyrify | lassulus | 2018-03-03 | 2 | -1/+10 |
| * | | | | l: turn pkgs into overlayprism/staging/pkgs | lassulus | 2018-03-03 | 4 | -37/+45 |
| * | | | | l deploy: don't run --diff | lassulus | 2018-03-03 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschli | jeschli | 2018-02-28 | 17 | -208/+95 |
|\| | | | |||||
| * | | | Merge remote-tracking branch 'gum/master' | lassulus | 2018-02-28 | 2 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | .gitignore: add result | makefu | 2018-02-28 | 2 | -1/+1 |
| * | | | Merge remote-tracking branch 'gum/master' | lassulus | 2018-02-28 | 11 | -192/+50 |
| |\| | | |||||
| | * | | ma pkgs.qcma: fix broken build | makefu | 2018-02-27 | 1 | -22/+14 |
| | * | | ma pkgs.mcomix: disable tests | makefu | 2018-02-27 | 1 | -0/+4 |
| | * | | ma pkgs.dionaea: rip | makefu | 2018-02-27 | 1 | -50/+0 |
| | * | | ma pkgs.farpd: rip | makefu | 2018-02-27 | 1 | -63/+0 |
| | * | | ma pkgs: cleanup awesomecfg, custom, shackie | makefu | 2018-02-27 | 6 | -56/+30 |
| | * | | ma pkgs.opl-utils: remove license for now | makefu | 2018-02-26 | 1 | -1/+2 |
| * | | | Merge remote-tracking branch 'prism/staging/jeschli' | lassulus | 2018-02-28 | 1 | -0/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'onondaga/master'prism/staging/nin | lassulus | 2018-02-27 | 1 | -0/+19 |
| |\ \ \ \ | |||||
| | * | | | | nin im: copy irc script from tv | nin | 2018-02-27 | 1 | -0/+19 |
| * | | | | | Merge remote-tracking branch 'onondaga/master' | lassulus | 2018-02-27 | 4 | -15/+25 |
| |\| | | | | |||||
| | * | | | | nin git: remove irc announce | nin | 2018-02-27 | 1 | -11/+0 |
| | * | | | | nin: follow krebs nixpkgs | nin | 2018-02-27 | 1 | -4/+1 |
| | * | | | | Merge remote-tracking branch 'prism/master' | nin | 2018-02-27 | 45 | -195/+672 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of prism:stockholm | nin | 2018-02-11 | 27 | -323/+497 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'prism/master' | nin | 2018-01-30 | 42 | -216/+717 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of prism:stockholm | nin | 2018-01-11 | 59 | -151/+577 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | nin axon: add ableton | nin | 2018-01-03 | 2 | -0/+24 |
| | * | | | | | | | | Merge branch 'master' of prism:stockholm | nin | 2018-01-03 | 2 | -0/+21 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | nixpkgs: d09e425 -> c5bc83b | lassulus | 2018-02-27 | 1 | -1/+1 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschli | jeschli | 2018-02-28 | 81 | -509/+1609 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of prism.r:stockholm into staging/jeschli | jeschli | 2018-02-27 | 7 | -19/+55 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'gum/master' | lassulus | 2018-02-26 | 6 | -14/+42 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | |||||
| | | * | | | | | | | ma git: init hydra-stockholm | makefu | 2018-02-26 | 1 | -0/+1 |
| | | * | | | | | | | ma programs-db: rip | makefu | 2018-02-26 | 2 | -13/+1 |
| | | * | | | | | | | ma hydra.wbob.r: init | makefu | 2018-02-26 | 3 | -1/+40 |
| | * | | | | | | | | l mail: add more mailboxes | lassulus | 2018-02-25 | 1 | -2/+5 |
| | * | | | | | | | | l mail: use tags for mailboxes | lassulus | 2018-02-25 | 1 | -3/+8 |
| * | | | | | | | | | Merge branch 'master' of prism.r:stockholm into staging/jeschli | jeschli | 2018-02-25 | 15 | -14/+150 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | l: init dpdkmprism/staging/mic | lassulus | 2018-02-24 | 1 | -0/+26 |
| | |/ / / / / / / |