Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'NixOS/master' into staging | Matthew Bauer | 2019-02-18 |
|\ | |||
| * | nixos/ssh: apply options after extraConfig | Kai Wohlfahrt | 2019-02-18 |
| * | Merge pull request #55410 from aanderse/apache-defaults | Silvan Mosberger | 2019-02-18 |
| |\ | |||
| | * | nixos/httpd: don't advertise php | Aaron Andersen | 2019-02-07 |
| | * | nixos/httpd: disable HTTP TRACE method by default | Aaron Andersen | 2019-02-07 |
| | * | nixos/httpd: disable TLSv1 by default for better security | Aaron Andersen | 2019-02-07 |
| * | | Merge pull request #55766 from Lucus16/bump-quassel | Silvan Mosberger | 2019-02-18 |
| |\ \ | |||
| | * | | nixos/quassel: Add support for certificate file | Lars Jellema | 2019-02-14 |
| * | | | Merge branch 'master' into headphones | rembo10 | 2019-02-18 |
| |\ \ \ | |||
| | * \ \ | Merge pull request #55955 from rnhmjoj/diod | Ryan Mulligan | 2019-02-17 |
| | |\ \ \ | |||
| | | * | | | nixos/diod: fix permissions | rnhmjoj | 2019-02-17 |
| | * | | | | Merge branch 'master' into singularity | Justin Bedő | 2019-02-17 |
| | |\ \ \ \ | |||
| | | * \ \ \ | Merge pull request #55957 from dasJ/icingaweb2-module | Ryan Mulligan | 2019-02-17 |
| | | |\ \ \ \ | |||
| | | | * | | | | nixos/icingaweb2: Init the module | Janne Heß | 2019-02-17 |
| | | | |/ / / | |||
| | | * | | | | Merge pull request #55922 from tek/master | Ryan Mulligan | 2019-02-17 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||
| | | | * | | | nixos/tt-rss: fix syntax error in pre-start script | Torsten Schmits | 2019-02-17 |
| | | * | | | | Merge pull request #55920 from matix2267/logind-lid-switch-external-power | Ryan Mulligan | 2019-02-16 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||
| | | | * | | | nixos/logind: Add option for HandleLidSwitchExternalPower | Mateusz Gołębiewski | 2019-02-16 |
| | | | |/ / | |||
| | | * | | | Merge pull request #55351 from timor/kio-extras-man-protocol | Thomas Tuegel | 2019-02-16 |
| | | |\ \ \ | |||
| | | | * | | | kio-extras: enable man protocol | timor | 2019-02-06 |
| | * | | | | | nixos/singularity: fix singularity output | Jörg Thalheim | 2019-01-31 |
| | * | | | | | nixos/singularity: fix indentation | Jörg Thalheim | 2019-01-31 |
| | * | | | | | singularity: update module to correctly wrap suid binary | Justin Bedo | 2019-01-31 |
| * | | | | | | headphones: init at 0.5.19 | rembo10 | 2018-09-16 |
* | | | | | | | Merge staging-next into staging | Frederik Rietdijk | 2019-02-16 |
|\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge master into staging-next | Frederik Rietdijk | 2019-02-16 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | * | | | | | | Merge pull request #55742 from aanderse/php-fpm | Jan Tojnar | 2019-02-16 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | nixos/phpfpm: allow configuring php.ini files per-pool | Aaron Andersen | 2019-02-13 |
| | * | | | | | | | docs: give matomo an ID | Graham Christensen | 2019-02-15 |
| | * | | | | | | | Merge pull request #55649 from johanot/flannel-with-kubernetes-backend | Jaka Hudoklin | 2019-02-15 |
| | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | nixos/flannel: node name needs to be configured for flannel to work with kube... | Johan Thomsen | 2019-02-13 |
| | | * | | | | | | | nixos/flannel: add options to configure kubernetes as config backend for flannel | Johan Thomsen | 2019-02-12 |
| | * | | | | | | | | Merge pull request #55667 from amazari/master | Peter Hoeg | 2019-02-15 |
| | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | zoneminder: fix build issue when using createLocally database | Alexandre Mazari | 2019-02-12 |
| | | |/ / / / / / / | |||
| | * | | | | | | | | Merge pull request #55517 from florianjacob/cups-fix-ssl-dir | Silvan Mosberger | 2019-02-14 |
| | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | nixos/cups: Fix Unable to encrypt connection: | Florian Jacob | 2019-02-14 |
| | * | | | | | | | | | Merge pull request #55301 from telotortium/tt-rss_disable_automatic_updates | Silvan Mosberger | 2019-02-14 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Remove option config.services.tt-rss.checkForUpdates (forced to false) | Robert Irelan | 2019-02-05 |
| | * | | | | | | | | | | Merge pull request #55540 from florianjacob/matomo | Silvan Mosberger | 2019-02-14 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | nixos/matomo: 3.8.0 introduces matomo.{php,js} files | Florian Jacob | 2019-02-11 |
| | | | |/ / / / / / / / | | | |/| | | | | | | | | |||
| | * | | | | | | | | | | Merge pull request #47747 from florianjacob/matomo-archive-processing-service | Silvan Mosberger | 2019-02-14 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | nixos/matomo: rename matomo_setup_update to matomo-setup-update | Florian Jacob | 2018-12-09 |
| | | * | | | | | | | | | | nixos/matomo: add automatic archive processing | Florian Jacob | 2018-12-09 |
| | * | | | | | | | | | | | Merge pull request #55515 from rycee/wpa_supplicant_citerefentry | Silvan Mosberger | 2019-02-14 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |||
| | | * | | | | | | | | | | nixos/wpa_supplicant: use `<citerefentry>` | Robert Helgesson | 2019-02-10 |
| | | | |/ / / / / / / / | | | |/| | | | | | | | | |||
* | | | | | | | | | | | | Merge master into staging | Frederik Rietdijk | 2019-02-14 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Merge pull request #55138 from oxij/tree/random-fixes | Michael Raskin | 2019-02-13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | nixos: rippled: fix type | Jan Malakhovski | 2019-02-03 |
| | * | | | | | | | | | | | nixos: version: cleanup a bit | Jan Malakhovski | 2019-02-03 |
| | * | | | | | | | | | | | nixos: rippled: fix indent | Jan Malakhovski | 2019-02-03 |