summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark Tails 3.0 as released.3.0intrigeri2017-06-101-2/+2
* Merge branch 'bugfix/12657-tor-browser-7.0.1' into testingintrigeri2017-06-103-17/+18
|\
| * Fetch Tor Browser from our own archive.intrigeri2017-06-101-1/+1
| * 10-tbb (apply_extension_code_signing_hacks): remove temporary directory once ...intrigeri2017-06-101-0/+1
| * Upgrade Tor Browser to 7.0.1-build1 (refs: #12657).intrigeri2017-06-102-17/+17
* | Updating SquashFS sort fileintrigeri2017-06-101-6561/+4850
* | Release process: fix typo.intrigeri2017-06-101-1/+1
* | Thunderbird: set -x in wrapper.anonym2017-06-101-0/+1
* | Merge remote-tracking branch 'origin/web/11997-3.0-release-notes' into testingintrigeri2017-06-101-13/+14
|\ \
| * | Add vertical space for emphasissajolida2017-06-101-2/+3
| * | Add minor changesajolida2017-06-101-0/+3
| * | Merge remote-tracking branch 'origin/testing' into web/11997-3.0-release-notessajolida2017-06-1067-3909/+8405
| |\ \
| * | | We remove the tray icon because it was problematicsajolida2017-06-101-9/+0
| * | | The sandboxing of Tor Browser is still quite limitedsajolida2017-06-101-1/+1
| * | | Clarifysajolida2017-06-101-2/+2
| * | | Stylesajolida2017-06-101-4/+4
| * | | Fix typosajolida2017-06-101-1/+1
| * | | Known issue++anonym2017-06-101-0/+6
* | | | Merge remote-tracking branch 'origin/master' into testingsajolida2017-06-1035-49/+639
|\ \ \ \ | |_|/ / |/| | |
| * | | Update PO filessajolida2017-06-1015-46/+349
| * | | Merge branch 'feature/6972+sponsorspage'sajolida2017-06-1020-3/+290
| |\ \ \
| | * | | Work around intrigeri's concern on #12442#note-19sajolida2017-06-101-1/+1
| | * | | Grammarsajolida2017-06-101-1/+1
| | * | | Fix HTMLsajolida2017-06-101-1/+1
| | * | | Add vertical space for emphasissajolida2017-06-101-2/+3
| | * | | Shortensajolida2017-06-101-1/+1
| | * | | Partly revert 851fb31872sajolida2017-06-101-1/+1
| | * | | Use title as anchorsajolida2017-06-101-1/+1
| | * | | Put the very short section before the very long onesajolida2017-06-101-9/+9
| | * | | Add vertical space for emphasissajolida2017-06-102-3/+4
| | * | | Shorten and unifysajolida2017-06-103-6/+6
| | * | | Merge branch 'feature/6972+sponsorspage' into feature/12521+linktopartnerssajolida2017-06-1067-1199/+1772
| | |\ \ \
| | | * | | Same as 5627bb7e44sajolida2017-06-101-1/+1
| | | * | | Use consistent typographysajolida2017-06-101-2/+2
| | | * | | Merge remote-tracking branch 'ulrike/feature/6972+sponsorspage' into feature/...sajolida2017-06-102-10/+42
| | | |\ \ \
| | | | * | | The fact that Laura and Ed Snowden offered their award to us was already publ...Ulrike Uhlig2017-06-061-3/+1
| | | | * | | Add two missing translationsUlrike Uhlig2017-06-061-0/+8
| | | | * | | Merge branch 'master' into feature/6972+sponsorspageUlrike Uhlig2017-06-066-21/+26
| | | | |\ \ \
| | | | * | | | Add Tor as partner in kind since they've been paying for one server since 201...Ulrike Uhlig2017-06-061-2/+12
| | | | * | | | Put OTF in the correct category.Ulrike Uhlig2017-06-061-1/+1
| | | | * | | | Moved these to local.css and improved them.Ulrike Uhlig2017-06-061-27/+0
| | | | * | | | Change wordsUlrike Uhlig2017-06-061-4/+4
| | | | * | | | Use correct markup for CSSUlrike Uhlig2017-06-061-4/+4
| | | | * | | | Add translations for partner pageUlrike Uhlig2017-06-061-0/+16
| | | | * | | | Try to hardcode CSS styles to be translatedUlrike Uhlig2017-06-061-0/+27
| | | | * | | | Merge branch 'master' into feature/6972+sponsorspageUlrike Uhlig2017-06-069-932/+292
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'feature/6972+sponsorspage' of webmasters.boum.org:wiki into fea...Ulrike Uhlig2017-06-0614-128/+170
| | | | |\ \ \ \ \
| | | * | \ \ \ \ \ Merge remote-tracking branch 'origin/master' into feature/6972+sponsorspagesajolida2017-06-0862-2145/+1839
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge remote-tracking branch 'origin/feature/6972+sponsorspage' into feature/...sajolida2017-06-020-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into feature/6972+sponsorspageintrigeri2017-05-31287-35954/+663
| | | | |\ \ \ \ \ \ \