summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into feature/15878-gitlabintrigeri10 days11-3658/+3653
|\
| * Updating SquashFS sort fileCyril Brulebois2020-05-041-3633/+3613
| |
| * Fetch Tor Browser from our own archive.Cyril Brulebois2020-05-041-1/+1
| |
| * Upgrade Tor Browser to 9.0.10-build2.Cyril Brulebois2020-05-042-3/+3
| |
| * Merge branch 'bugfix/17590-perl-test-suites-deps' into stable (Closes: ↵intrigeri2020-04-224-2/+21
| |\ | | | | | | | | | #17590, #17591, #17592)
| | * Move nodejs dependency where it's actually usedintrigeri2020-04-222-2/+2
| | | | | | | | | | | | | | | | | | We only use nodejs in tails-transform-mirror-url, which is only called from Tails::MirrorPool, that's part of our perl5lib, so let's encode the dependency there. This should fix the last problem reported on #17592.
| | * Merge remote-tracking branch 'origin/stable' into ↵intrigeri2020-04-124-4098/+4107
| | |\ | | | | | | | | | | | | bugfix/17590-perl-test-suites-deps
| | * | iuk: declare missing test dependencies (refs: #17592)intrigeri2020-04-051-0/+16
| | | |
| | * | perl5lib: declare missing test dependencies (refs: #17591)intrigeri2020-04-051-0/+3
| | | |
| * | | Merge remote-tracking branch 'origin/feature/16719-ibus-mozc' into stableanonym2020-04-153-14/+12
| |\ \ \ | | | | | | | | | | | | | | | Fix-committed: #16719
| | * | | Switch Japanese input method from Anthy to Mozc (refs: #16719)intrigeri2020-03-263-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Japanese speaker (passis12345678) tells us that: "I don't think any Japanese users would agree that Anthy is better than Mozc. The accuracy of Mozy's Kanji conversion is clearly superior to that of Anthy. I’ve never seen or heard of anyone who likes Anthy. Any Japanese user would be happy to replace Anthy with Mozc." They also note that ibus-anthy has one advantage over ibus-mozc: it defaults to Japanese input, while ibus-mozc defaults to alphabetic and the user has to change the setting to Japanese every time they login. Despite that drawback, passis12345678 thinks that switching to Mozc is worth it anyway: it's a one-per-Tails-session annoyance, as opposed to a permanent annoyance while typing in Japanese. This would be fixed by fcitx-mozc (which defaults to Japanese), but switching to fcitx is another, much bigger matter: IBus seems to be much better integrated into GNOME than fcitx. Let's stick to IBus for now and try this minimal change.
| * | | | Merge remote-tracking branch 'local-website/master' into stableintrigeri2020-04-151-5/+0
| |\ \ \ \
| | * | | | Tails images: upgrade to po4a 0.55 (refs: #17005)intrigeri2020-04-121-5/+0
| | | |_|/ | | |/| |
| * | | | Merge branch 'feature/17153-u2f' into stable (Closes: #17153)intrigeri2020-04-131-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 1/2 of adding U2F support. Part 2/2 is: use torbrowser-launcher >= 0.3.2-8 when building Tails. This is already the case on our devel branch, and will become the case on the stable branch once we bump the 'debian' APT snapshot there to a version that has a recent enough torbrowser-launcher. For details, see https://redmine.tails.boum.org/code/issues/17153#note-7
| | * | | | Add the libu2f-udev package for u2f device supportBirger Schacht2020-04-121-0/+3
| | |/ / /
| * | | | Update our list of 'Favorites' applications (#16990)sajolida2020-04-121-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'origin/master' into feature/15878-gitlabintrigeri2020-04-0881-4538/+9032
|\ \ \ \ | |/ / /
| * | | Restore master's base branch.Cyril Brulebois2020-04-071-1/+1
| | | |
| * | | Updating SquashFS sort fileCyril Brulebois2020-04-061-4094/+4103
| | | |
| * | | Fetch Tor Browser from our own archive.Cyril Brulebois2020-04-061-1/+1
| | | |
| * | | Upgrade Tor Browser to 9.0.9-build1.Cyril Brulebois2020-04-062-3/+3
| | |/ | |/|
| * | Updating SquashFS sort fileCyril Brulebois2020-03-261-4179/+4241
| | |
| * | Restore testing's base branch.Cyril Brulebois2020-03-261-1/+1
| | |
| * | Freeze APT snapshots for 4.5~rc1.Cyril Brulebois2020-03-262-2/+2
| | |
| * | Merge remote-tracking branch 'origin/devel' into ↵intrigeri2020-03-2531-3504/+3519
| |\ \ | | | | | | | | | | | | feature/17526-import-t-p-s+force-all-tests
| | * \ Merge branch 'stable' into develCyril Brulebois2020-03-241-3244/+3214
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: debian/changelog
| | * | Merge branch 'stable' into develCyril Brulebois2020-03-222-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/APT_snapshots.d/torproject/serial debian/changelog Keep “latest” as torproject serial, and prefer our own changelog entry as usual.
| | * | | Name SYSLINUX on the boot loader menu (refs: #17538)sajolida2020-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People might be faced with either GRUB or SYSLINUX and have to perform different procedures to edit the boot options. GRUB is already named on the screen. Naming SYSLINUX will make it easier to write the doc and for people to relate to which of the 2 boot loaders they get.
| | * | | Deduplicate and reorderintrigeri2020-03-201-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | It seems this script results from the concatenation of 2 older ones, so the initialization bits ended up duplicated and wrongly ordered.
| | * | | Declare variables as local (refs: #6560)intrigeri2020-03-201-3/+3
| | | | |
| | * | | Point to the corresponding design docintrigeri2020-03-201-0/+1
| | | | |
| | * | | Add (somewhat overzealous) quotesintrigeri2020-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're not actually needed in this exact context, but adding them does not hurt, and avoids reviewers and fellow developers wondering whether quotes are missing or not next time they read this code.
| | * | | Merge remote-tracking branch 'origin/devel' into ↵intrigeri2020-03-201-37/+54
| | |\ \ \ | | | | | | | | | | | | | | | | | | feature/6560-secure-boot+force-all-tests
| | * \ \ \ Merge branch 'feature/8415-overlayfs+force-all-tests' into ↵intrigeri2020-03-191-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | feature/6560-secure-boot+force-all-tests
| | | * | | | Update commentintrigeri2020-03-191-2/+2
| | | | | | |
| | * | | | | Merge branch 'feature/8415-overlayfs+force-all-tests' into ↵intrigeri2020-03-192-11/+10
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | feature/6560-secure-boot+force-all-tests
| | | * | | | Merge branch 'feature/8415-overlayfs+force-all-tests' into ↵intrigeri2020-03-167-4249/+4271
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bugfix/15146-overlayfs-memory-erasure+force-all-tests
| | | * | | | | Move more /oldroot mountpoints out of the waysegfault2020-03-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We suspect that this fixes a race condition which causes the memory erasure test to fail on Jenkins.
| | | * | | | | Lock tails-remove-overlayfs-dirs.service in memorysegfault2020-03-151-0/+1
| | | | | | | |
| | | * | | | | Merge branch 'feature/8415-overlayfs+force-all-tests' into ↵segfault2020-03-053-3/+4
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/15146-overlayfs-memory-erasure
| | | * \ \ \ \ \ Merge branch 'feature/8415-overlayfs+force-all-tests' into ↵segfault2020-02-224-5/+7
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/15146-overlayfs-memory-erasure
| | | * | | | | | | Don't try to move overlay mount dir in initramfs-pre-shutdown-hook (refs: ↵segfault2020-02-211-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #15146) With overlayfs, /lib/live/mount/overlay (the upper dir), is successfully unmounted before our initramfs-pre-shutdown-hook is executed, so we don't have to move and unmount it manually anymore, and the respective commands fail.
| | * | | | | | | | Merge branch 'feature/8415-overlayfs+force-all-tests' into ↵intrigeri2020-03-157-4249/+4271
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | feature/6560-secure-boot+force-all-tests
| | | * | | | | | | Merge remote-tracking branch 'origin/devel' into ↵intrigeri2020-03-157-4249/+4271
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | feature/8415-overlayfs+force-all-tests
| | * | | | | | | | Merge branch 'feature/8415-overlayfs+force-all-tests' into ↵intrigeri2020-03-053-3/+4
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | feature/6560-secure-boot+force-all-tests
| | | * | | | | | | Merge remote-tracking branch 'origin/stable' into ↵intrigeri2020-03-052-2/+2
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/8415-overlayfs+force-all-tests
| | | * | | | | | | | Update comment for overlayfs (refs: #17451)intrigeri2020-02-221-1/+2
| | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Repair 32-bit EFI boot (refs: #15806)intrigeri2020-02-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was broken while switching 64-bit EFI to GRUB.
| | * | | | | | | | Upgrader: also delete files that were removed in EFI/debian (refs: #15806)intrigeri2020-02-221-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, automatic upgrades would never delete anything in there.
| | * | | | | | | | Merge branch 'feature/6560-secure-boot' into ↵segfault2020-02-211-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/6560-secure-boot+force-all-tests