summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'devel' into bugfix/16952-keepassxc-not-in-POTFILES.inbugfix/16952-keepassxc-not-in-POTFILES.insegfault2019-08-115-168/+59
|\
| * Fix update-acng-config to generate rules for Tails 4 and 5.anonym2019-08-101-1/+1
| * Merge branch 'stable' into develintrigeri2019-08-101-3/+15
| |\
| | * Merge branch 'test/16825-ignore-rarp' into stableintrigeri2019-08-101-3/+15
| | |\
| | | * Merge branch 'stable' into test/16825-ignore-rarpintrigeri2019-08-103042-34644/+437627
| | | |\ | | | |/ | | |/|
| | | * Test suite: ignore RARP packets.anonym2019-06-191-3/+15
| * | | Fix typo.intrigeri2019-08-101-1/+1
| * | | Merge branch 'feature/buster' into develsajolida2019-08-091-12/+5
| |\ \ \
| | * | | Traverso was removed in 3.14sajolida2019-08-061-7/+0
| | * | | Fix typossajolida2019-08-061-5/+5
| * | | | Improve comment.anonym2019-08-091-6/+5
| * | | | Merge remote-tracking branch 'origin/bugfix/16941-torbrowser-launcher-0.3.2+f...anonym2019-08-091-146/+33
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/devel' into bugfix/16941-torbrowser-laun...bugfix/16941-torbrowser-launcher-0.3.2+force-all-testsintrigeri2019-08-0862-2500/+2578
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Tor Browser AppArmor profile: update patch to apply on top of 0.3.2-1 (refs: ...intrigeri2019-08-071-146/+33
* | | | | | Update POT and PO files.segfault2019-08-1150-5231/+5842
* | | | | | Fix order of entries in POTFILES.insegfault2019-08-081-2/+2
* | | | | | Add keepassxc.pot to POTFILES.in (refs: #16952)segfault2019-08-081-0/+1
|/ / / / /
* | | | | Merge branch 'stable' into develintrigeri2019-08-0854-2476/+2520
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'origin/bugfix/16601-fix-translations' into stab...intrigeri2019-08-0854-2478/+2525
| |\ \ \ \
| | * | | | Update POT and PO files.segfault2019-08-0550-2470/+2523
| | * | | | ASP: Make window title translatable (refs: #16601)segfault2019-08-051-1/+1
| | * | | | ASP: Set gettext domain to "tails" in confguration-window.ui (refs #16601)segfault2019-08-051-1/+1
| | * | | | Merge branch 'stable' into bugfix/16601-fix-translationssegfault2019-08-043325-59204/+459064
| | |\ \ \ \
| | * | | | | ASP: fix tranlsationAlan2019-04-053-6/+0
* | | | | | | Merge branch 'stable' into develintrigeri2019-08-075-0/+42
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/master' into stableintrigeri2019-08-075-0/+42
| |\ \ \ \ \ \
| | * | | | | | Update the pythonlib submodule.intrigeri2019-08-071-0/+0
| | * | | | | | Fixup UDFs for 4.0~beta1.anonym2019-08-074-28/+28
| | * | | | | | Add UDFs for Tails 4.0~beta1.anonym2019-08-074-0/+42
* | | | | | | | Merge remote-tracking branch 'origin/devel' into develintrigeri2019-08-07300-6947/+8020
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Empty the list of APT overlays: they were mergedanonym2019-08-071-0/+0
| * | | | | | | Merge remote-tracking branch 'origin/feature/buster' into develanonym2019-08-07854-27274/+27883
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into feature/busterfeature/busteranonym2019-08-07554-20327/+19863
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | WIP: changelog for 4.0~beta1anonym2019-08-061-0/+614
| | * | | | | | | Re-add missing TorBirdy patch to feature/buster.anonym2019-08-061-0/+66
| | * | | | | | | Merge remote-tracking branch 'origin/stable' into feature/busteranonym2019-08-061-1/+4
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge branch 'devel' into feature/busterintrigeri2019-08-010-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'devel' into feature/busterintrigeri2019-07-3110-2302/+9
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Revert "Install tor 0.4.x from Debian experimental."intrigeri2019-07-313-6/+0
| | * | | | | | | | | Merge remote-tracking branch 'origin/bugfix/16857-dmidecode-in-initramfs' int...intrigeri2019-07-141-0/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Copy dmidecode to initramfs (refs: #16857)segfault2019-07-071-0/+3
| | * | | | | | | | | | Merge branch 'devel' into feature/bustersegfault2019-07-134-89/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Reintroduce the same APT pinning as we use in 3.x for uBlock.intrigeri2019-07-131-0/+4
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/devel' into feature/busterintrigeri2019-07-11122-928/+4663
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Refresh PO files.intrigeri2019-07-0917-602/+736
| | * | | | | | | | | | | | Merge branch 'devel' into feature/busterCyril Brulebois2019-07-0822-1066/+833
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'devel' into feature/bustersegfault2019-07-0718-85/+809
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'devel' into feature/bustersegfault2019-07-0752-1466/+1973
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Remove doc about obsolete bug.intrigeri2019-07-061-7/+0
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/feature/16837-new-splash' into feature/b...intrigeri2019-07-062-0/+120
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \