summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'stable' into develintrigeri2019-08-07555-20344/+19872
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge remote-tracking branch 'origin/master' into stableintrigeri2019-08-07555-20344/+19872
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | / | | | |_|_|/ | | |/| | |
| | | * | | Update the pythonlib submodule: feature/buster was merged into devel.intrigeri2019-08-071-0/+0
| | | * | | If we release a 3.17 it'll be a bugfix release.intrigeri2019-08-071-1/+1
| | | * | | merge Weblate changes using merge_weblate_changes.py.Tails translators2019-08-072-23/+15
| | | |\ \ \
| | | | * | | Translated using Weblate (French)emmapeel2019-08-071-4/+6
| | | | * | | Weblate commitanonymous2019-08-071-18/+8
| | | | * | | Weblate commitJoaquín Serna2019-08-071-3/+3
* | | | | | | Tor Browser AppArmor profile: update patch to apply on top of 0.3.2-1 (refs: ...intrigeri2019-08-071-146/+33
| |_|_|_|/ / |/| | | | |
* | | | | | 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
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Switch RMs.intrigeri2019-08-061-1/+1
| | | |/ / | | |/| |
| | * | | Translated using Weblate (Spanish)anonymous2019-08-051-2/+5
| | * | | Translated using Weblate (Spanish)Joaquín Serna2019-08-051-5/+5
| | * | | ikiwiki-cgi.setup: point history & diff URLs to Salsa.intrigeri2019-08-051-2/+2
| | * | | Consistently suggest forking us on Salsa.intrigeri2019-08-053-3/+3
| | * | | Roadmap: mark 2 completed items as such.intrigeri2019-08-051-2/+2
| | * | | Fix Markdown syntax.intrigeri2019-08-051-1/+1
| | * | | Better document current sysadmin team ticket management (Closes: #16854).intrigeri2019-08-051-2/+8
| | * | | Clarify.intrigeri2019-08-051-1/+1
| | * | | Add press appearancesajolida2019-08-051-0/+9
| | * | | Remove meaningless statssajolida2019-08-057-15/+8
| | * | | 2019-07 report: add stuff I was involved in.intrigeri2019-08-051-1/+26
| | * | | Revert spam.intrigeri2019-08-059-106/+64
| | * | | Translated using Weblate (Spanish)anonymous2019-08-041-14/+10
| | * | | Weblate commitanonymous2019-08-041-12/+16
| | * | | This reverts commit a57d0cb1fee939e159c3afd0895642114f125685127.0.0.12019-08-041-2/+2
| | * | | This reverts commit 870e7f3734b3a16cac80e02577dc6a2c2ea701cf127.0.0.12019-08-041-1/+1
| | * | | This reverts commit 840e8c8d54bede75432a70b1b7ca73d518b34a08127.0.0.12019-08-041-3/+0
| | * | | This reverts commit 5e61d7accdf56a378644ca11729acb0fef5045d9127.0.0.12019-08-041-8/+5
| | * | | This reverts commit 3714a4aad81f17750ea06874c73bc18ff52544c4127.0.0.12019-08-049-51/+99
| | * | | Revert spam.intrigeri2019-08-039-99/+51
| | * | | Merge remote-tracking branch 'remotes/origin/master'intrigeri2019-08-0310-54/+102
| | |\ \ \
| | | * | | This reverts commit bdadb77b6ea1199958011f2ce30607f3bbd2c599127.0.0.12019-08-025-0/+68
| | | * | | This reverts commit 2f81cab683aad9f9e7b436c3b47dd4b74d578cb8127.0.0.12019-08-021-1/+1