summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into bugfix/9563-mention-i2p-for...bugfix/9563-mention-i2p-for-torrentssajolida2015-08-2754-407/+972
|\
| * Allow local connections to Mumble serversajolida2015-08-261-0/+4
| * Add one more idea.intrigeri2015-08-261-0/+7
| * updated PO filesamnesia2015-08-266-193/+244
| * Merge branch 'doc/9391-circuitview' (Closes: #9391)sajolida2015-08-262-23/+35
| |\
| | * Improve grammar (#9391)sajolida2015-08-261-2/+2
| | * Merge remote-tracking branch 'origin/master' into doc/9391-circuitviewintrigeri2015-08-2517-147/+453
| | |\
| | * \ Merge remote-tracking branch 'origin/master' into doc/9391-circuitviewintrigeri2015-08-215-7/+20
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/master' into doc/9391-circuitviewsajolida2015-08-20314-6779/+20872
| | |\ \ \
| | * | | | Be more explicitsajolida2015-08-191-1/+1
| | * | | | Add vertical spacesajolida2015-08-171-1/+3
| | * | | | Merge two sentences to shortensajolida2015-08-171-5/+4
| | * | | | Format ticket numbers nicelysajolida2015-08-171-1/+1
| | * | | | This is not our businesssajolida2015-08-171-3/+1
| | * | | | Be more precisesajolida2015-08-171-1/+1
| | * | | | Fix classessajolida2015-08-171-4/+4
| | * | | | Avoid Saxon genitive, especially for objectssajolida2015-08-171-2/+2
| | * | | | Revert "formatting"sajolida2015-08-171-38/+28
| | * | | | Merge remote-tracking branch 'bitingbird/doc/9391-circuitview' into doc/9391-...sajolida2015-08-171-63/+66
| | |\ \ \ \
| | | * | | | new identity under torbutton (#9391)BitingBird2015-08-111-22/+21
| | | * | | | reorganize (#9391)BitingBird2015-08-111-6/+5
| | | * | | | https everywhere as sub-section of https encryption (#9391)BitingBird2015-08-111-2/+1
| | | * | | | shortening (#9391)BitingBird2015-08-111-3/+2
| | | * | | | shortening (#9391)BitingBird2015-08-111-3/+2
| | | * | | | shortening (#9391)BitingBird2015-08-111-2/+2
| | | * | | | formattingBitingBird2015-08-111-27/+38
| | | * | | | moving circuit view under Torbutton, putting it in a note instead ofBitingBird2015-08-111-20/+17
| | * | | | | Merge remote-tracking branch 'origin/master' into doc/9391-circuitviewsajolida2015-08-10172-1192/+5348
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | release notes -> link to new doc about circuit view (#9391)BitingBird2015-07-061-1/+1
| | * | | | | disabling circuit view in Tails (#9391)BitingBird2015-07-061-0/+20
| * | | | | | updated PO filesamnesia2015-08-253-3/+21
| * | | | | | Add bookletsajolida2015-08-251-0/+2
| * | | | | | Add eventsajolida2015-08-251-0/+3
| * | | | | | Formattingsajolida2015-08-251-1/+1
| * | | | | | Use plain link instead of bit.ly.elouann2015-08-251-2/+2
| * | | | | | Add fingerprintsajolida2015-08-251-1/+2
| * | | | | | Cloning doesn't work with slashessajolida2015-08-251-3/+3
| * | | | | | + Tails trainings127.0.0.12015-08-251-0/+2
| * | | | | | + LIMA15127.0.0.12015-08-251-1/+1
| * | | | | | Merge remote-tracking branch 'origin/master'intrigeri2015-08-251-7/+3
| |\ \ \ \ \ \
| | * | | | | | updated PO filesamnesia2015-08-251-7/+3
| * | | | | | | [fr] fix grammar.intrigeri2015-08-251-2/+2
| |/ / / / / /
| * | | | | | Merge branch 'web/9279-translatable-iso-size'intrigeri2015-08-2522-33/+197
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge remote-tracking branch 'origin/master' into web/9279-translatable-iso-sizeintrigeri2015-08-25407-7169/+25249
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Calendar: remove past events.intrigeri2015-08-251-6/+0
| * | | | | | Merge remote-tracking branch 'elouann/fr-merge-patches-from-the-list'intrigeri2015-08-256-59/+149
| |\ \ \ \ \ \
| | * | | | | | [fr] Review of 9289873elouann2015-08-232-10/+10
| | * | | | | | [fr] Import of Chre/Translating-of-wiki-src-news-version_1.5.fr.po-by-Ch.patchelouann2015-08-231-12/+22
| | * | | | | | [fr] Import of Atomike/translation-for-Numerous_security_holes_in_1.4.1.fr..p...elouann2015-08-231-17/+45
| | * | | | | | [fr] Import of Syl/Fix-a-typo.patchelouann2015-08-231-1/+1