summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/8471-32-bit-UEFI' into feature/jessie+32-bit-UEFIfeature/jessie+32-bit-UEFIintrigeri2015-07-071-48/+4
|\
| * grub.cfg: drop the menu, and directly load the syslinux configuration.intrigeri2015-07-071-6/+4
| * grub.cfg: drop all GRUB menu entries except the one that loads syslinux config.intrigeri2015-07-071-42/+0
| * Merge remote-tracking branch 'origin/devel' into feature/8471-32-bit-UEFIintrigeri2015-07-075-10/+38
| |\
| | * Merge remote-tracking branch 'origin/feature/9381-ship-amd64-syslinux' into d...Alan2015-07-054-9/+38
| | |\
* | | \ Merge branch 'feature/jessie' into feature/jessie+32-bit-UEFIintrigeri2015-07-0710-43/+56
|\ \ \ \
| * | | | live-persist: remove now unused dbus_udisks_get_attribute().intrigeri2015-07-061-13/+0
| * | | | live-persist: stop overriding live-boot's functions, we now have a recent eno...intrigeri2015-07-061-16/+0
| * | | | Really allow the t-p-s user to modify system devices without requiring authen...intrigeri2015-07-061-0/+2
| * | | | Update polkit rules wrt. the porting of t-p-s to udisks2.intrigeri2015-07-051-3/+3
| * | | | Fix syntax of libnet-dbus-perl's APT pinning.intrigeri2015-07-051-1/+1
| * | | | Enable jessie-backports APT source.intrigeri2015-07-052-0/+2
| * | | | Merge branch 'devel' into feature/jessieintrigeri2015-07-041-1/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'origin/devel' into feature/7976-disallow-lan-in...intrigeri2015-07-0113-4736/+6855
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/stable' into feature/7976-disallow-lan-i...anonym2015-05-18127-13004/+7641
| | |\ \ \ \
| | * | | | | Disable LAN access in the Tor Browser (Will-fix: #7976).anonym2015-04-081-1/+0
| * | | | | | Merge branch 'feature/9381-ship-amd64-syslinux' into feature/jessieintrigeri2015-07-044-9/+38
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Enable the feature-9381-ship-amd64-syslinux APT overlay.intrigeri2015-06-121-0/+0
| | * | | | | Include a syslinux 64-bit binary in the ISO filesystem.intrigeri2015-06-121-7/+28
| | * | | | | Make section headings in comments more visible.intrigeri2015-06-121-3/+3
| | * | | | | Configure dpkg to support amd64 as a foreign architecture.intrigeri2015-06-121-0/+7
| | * | | | | Tell APT to download indices both for i386 and amd64.intrigeri2015-06-121-0/+1
| * | | | | | Install python-dbus{,-dev} from Jessie, instead of our own patched one.intrigeri2015-07-031-0/+10
* | | | | | | Merge branch 'feature/8471-32-bit-UEFI' into feature/jessie+32-bit-UEFIintrigeri2015-07-021-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add the feature-8471-32-bit-uefi APT overlay.intrigeri2015-07-021-0/+0
| * | | | | | Merge branch 'devel' into feature/8471-32-bit-UEFIintrigeri2015-07-0244-5543/+8040
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'feature/jessie' into feature/jessie+32-bit-UEFIintrigeri2015-07-0110-4728/+6848
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'devel' into feature/jessieintrigeri2015-07-011-3817/+3844
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'stable' into develintrigeri2015-07-011-3817/+3844
| | |\ \ \ \ \
| | | * | | | | Updating SquashFS sort file1.4.1intrigeri2015-06-291-3817/+3844
| * | | | | | | Merge branch 'devel' into feature/jessieintrigeri2015-06-294-892/+2951
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'stable' into develintrigeri2015-06-294-892/+2951
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Empty the list of APT overlays: they were mergedintrigeri2015-06-291-0/+0
| | | * | | | | Merge branch 'feature/9560-tor-0.2.6.9' into stableintrigeri2015-06-291-0/+0
| | | |\ \ \ \ \
| | | | * | | | | Add the feature/9560-tor-0.2.6.9 APT overlay.intrigeri2015-06-151-0/+0
| | | | | |/ / / | | | | |/| | |
| | | * | | | | Merge branch 'feature/9649-tor-browser-4.5.3' into stableintrigeri2015-06-292-16/+16
| | | |\ \ \ \ \
| | | | * | | | | Fetch Tor Browser from our own archive.intrigeri2015-06-281-1/+1
| | | | * | | | | Upgrade Tor Browser to 4.5.3-build2.intrigeri2015-06-282-16/+16
| | | | |/ / / /
| | | * | | | | Empty the list of APT overlays: they were mergedintrigeri2015-06-291-0/+0
| | | * | | | | Update AdBlock Plus patterns.intrigeri2015-06-281-876/+2935
| | | |/ / / /
| * | | | | | Explicitly disable systemd-networkd, to prevent any risk of DNS leaks it migh...intrigeri2015-06-211-0/+7
| * | | | | | Remove jessie-updates APT source: it's already included in our Jessie builds.intrigeri2015-06-122-2/+0
| * | | | | | Merge remote-tracking branch 'origin/devel' into feature/jessieanonym2015-06-124-2/+18
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'stable' into develanonym2015-06-114-2/+18
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge remote-tracking branch 'origin/bugfix/7249-truncated-notifications' int...anonym2015-06-111-0/+0
| | | |\ \ \ \
| | | | * | | | Add the bugfix-7249-truncated-notifications APT overlay.intrigeri2015-05-311-0/+0
| | | * | | | | Merge remote-tracking branch 'origin/bugfix/9126-deny-tor-browser-access-to-r...anonym2015-06-101-2/+6
| | | |\ \ \ \ \
| | | | * | | | | AppArmor: deny Tor Browser access to the list of recently used files.intrigeri2015-06-061-2/+6
| | | | |/ / / /
| | | * | | | | Merge remote-tracking branch 'origin/bugfix/9364-do-not-modify-hardware-clock...anonym2015-06-102-0/+12
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge remote-tracking branch 'origin/stable' into bugfix/9364-do-not-modify-h...intrigeri2015-05-316-26/+35
| | | | |\ \ \ \ \ | | | | | |/ / / /