summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable' into develCyril Brulebois2018-10-252-45/+56
|\
| * Declare that Enigmail is compatible with Thunderbird 60.*.intrigeri2018-10-231-0/+11
| * Updating SquashFS sort fileCyril Brulebois2018-10-231-45/+45
* | Merge branch 'stable' into develCyril Brulebois2018-10-225-46/+0
|\ \ | |/
| * Empty the list of APT overlays: they were mergedCyril Brulebois2018-10-224-0/+0
| * Merge remote-tracking branch 'origin/stable' into stableCyril Brulebois2018-10-222-0/+12
| |\
| * | Remove leftover file (refs: #15911).Cyril Brulebois2018-10-221-46/+0
* | | Merge branch 'stable' into develintrigeri2018-10-222-0/+12
|\ \ \ | | |/ | |/|
| * | Declare Torbirdy as compatible with Thunderbird 60.* (refs: #16037).intrigeri2018-10-221-0/+12
| * | Enable the bugfix-16037-upgrade-thunderbird-to-60.2.1 APT overlay (refs: #160...intrigeri2018-10-221-0/+0
| |/
* | Merge branch 'stable' into develintrigeri2018-10-214-34/+40
|\ \ | |/
| * Merge branch 'bugfix/16029-fix-spoof-english+force-all-tests' into stable (Fi...intrigeri2018-10-211-0/+2
| |\
| | * Merge branch 'stable' into bugfix/16029-fix-spoof-english+force-all-testsintrigeri2018-10-219-32/+32
| | |\
| | * | Set the firefox preferences to spoof English (refs: #16029)segfault2018-10-201-0/+2
| * | | Merge remote-tracking branch 'origin/bugfix/15838-asp-fix-non-blocking-issues...intrigeri2018-10-213-34/+38
| |\ \ \ | | |_|/ | |/| |
| | * | ASP: Make code more readable (refs: #15983)segfault2018-10-201-7/+8
| | * | ASP: fix issue when checking which packages are ASPAlan2018-10-181-2/+2
| | * | Merge remote-tracking branch 'origin/stable' into bugfix/15838-asp-fix-non-bl...Alan2018-10-1811-60/+52
| | |\ \ | | | |/
| | * | ASP: remove useless formatAlan2018-10-151-1/+1
| | * | ASP: log to stderrAlan2018-10-151-2/+2
| | * | ASP: replace assert by raising an exceptionAlan2018-10-153-4/+6
| | * | ASP: fix typo in docstringAlan2018-10-151-1/+1
| | * | ASP: use logging.warning instead of deprecated logging.warnAlan2018-10-151-18/+19
| | * | ASP: fix shebangAlan2018-10-151-1/+1
* | | | Merge branch 'stable' into develintrigeri2018-10-212-26/+26
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/16067-tor-browser-8.0.3+force-all-tests' into stable (F...intrigeri2018-10-212-26/+26
| |\ \ \
| | * | | Fetch Tor Browser from our own archive.intrigeri2018-10-201-1/+1
| | * | | Upgrade Tor Browser to 8.0.3-build1.intrigeri2018-10-202-26/+26
* | | | | Merge branch 'stable' into develintrigeri2018-10-201-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Enable the bugfix-15166-installer-crash APT overlay (refs: #15166).intrigeri2018-10-201-0/+0
| |/ / /
* | | | Merge branch 'stable' into develintrigeri2018-10-201-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/stable' into stableintrigeri2018-10-201-1/+1
| |\ \ \
| | * \ \ Merge branch 'master' into stableintrigeri2018-10-201-1/+1
| | |\ \ \
| | | * | | Fix display problems in browsers with caching (#16049)sajolida2018-10-161-1/+1
| | | |/ /
* | | | | Merge branch 'stable' into develintrigeri2018-10-204-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'origin/stable' into bugfix/15829-harden-sudo-co...intrigeri2018-10-208-24/+17
| |\ \ \ \ | | |/ / /
| * | | | Merge remote-tracking branch 'origin/stable' into bugfix/15829-harden-sudo-co...intrigeri2018-10-1620-138/+158
| |\ \ \ \
| * \ \ \ \ Merge branch 'stable' into bugfix/15829-harden-sudo-config+force-all-testsintrigeri2018-09-1128-4894/+5617
| |\ \ \ \ \
| * | | | | | Harden sudo configuration (refs: #15829).intrigeri2018-08-224-5/+5
* | | | | | | Merge branch 'stable' into develintrigeri2018-10-191-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'feature/14481-TCRYPT-support-beta' into stable (Fix-committed: ...intrigeri2018-10-191-0/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Enable the feature-14481-tcrypt-support-beta APT overlay (refs: #14481).segfault2018-10-161-0/+0
* | | | | | | Merge branch 'stable' into develsegfault2018-10-173-18/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'bugfix/15912-htpdate-user-agent' into stablesegfault2018-10-173-18/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into bugfix/15912-htpdate-user-a...intrigeri2018-10-167-42/+51
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Hardcode User Agent in htpdate.user-agent (refs: #15912)segfault2018-10-163-18/+1
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'stable' into develintrigeri2018-10-171-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'feature/11501-install-verbs-instead-yes-no' into stable (Fix-co...intrigeri2018-10-171-0/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Replace patch with the feature-11501-install-verbs-instead-yes-no APT overlay...intrigeri2018-10-172-47/+0
| | * | | | | Merge remote-tracking branch 'origin/stable' into feature/11501-install-verbs...intrigeri2018-10-164-36/+35
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |