summaryrefslogtreecommitdiffstats
path: root/wiki
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/devel' into develintrigeri2017-03-152-6/+6
|\
| * Install ikiwiki from jessie-backports, instead of our patched one (refs: #120...intrigeri2017-03-132-6/+6
* | (no commit message)127.0.0.12017-03-141-14/+12
* | (no commit message)127.0.0.12017-03-141-24/+22
* | Link Code of Conduct and Social Contract togethersajolida2017-03-142-1/+4
* | Merge remote-tracking branch 'origin/master'sajolida2017-03-142-5/+27
|\ \
| * | (no commit message)127.0.0.12017-03-141-0/+2
| * | (no commit message)127.0.0.12017-03-141-1/+13
| * | translate.vm updates127.0.0.12017-03-141-4/+12
* | | Use the official name of the Tor Social Contractsajolida2017-03-131-1/+1
|/ /
* | Add note of preventing spamsajolida2017-03-131-0/+8
* | Add note about backupssajolida2017-03-131-0/+7
* | Add data source for personassajolida2017-03-131-0/+6
* | Add data source for personassajolida2017-03-131-2/+7
* | Add notes about research plans for VeraCryptsajolida2017-03-131-0/+10
* | Add data source for personassajolida2017-03-131-0/+9
* | Add RTIRsajolida2017-03-131-0/+3
* | Be more personalsajolida2017-03-131-3/+3
* | Create blueprint for Portuguese teamsajolida2017-03-131-0/+0
* | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2017-03-137-0/+125
|\ \
| * \ Merge remote-tracking branch '451f/feature/11987+remove_ikiwiki_timestamps' (...intrigeri2017-03-132-0/+81
| |\ \
| | * | Adding templates from latest ikiwiki versionUlrike Uhlig2017-03-132-0/+81
| * | | Add UDF:s for Tails 2.11.1.anonym2017-03-134-0/+42
| * | | Add Icecast to the wish list127.0.0.12017-03-131-0/+2
| |/ /
* | | Including sajolidas remarksUlrike Uhlig2017-03-131-4/+4
|/ /
* | Revert spam.intrigeri2017-03-131-1/+0
* | (no commit message)127.0.0.12017-03-121-0/+1
* | Merge remote-tracking branch 'xin/translate/known_issues'intrigeri2017-03-121-9/+8
|\ \
| * | [fr] update translationxin2017-03-121-9/+8
* | | (no commit message)127.0.0.12017-03-121-4/+10
|/ /
* | Cleanup.intrigeri2017-03-121-5/+1
* | Merge remote-tracking branch 'xin/translate/3.0beta2'intrigeri2017-03-121-37/+78
|\ \
| * | [fr] update translationxin2017-03-091-37/+78
* | | Merge remote-tracking branch 'xin/translate/2.11'intrigeri2017-03-123-54/+124
|\ \ \
| * | | [fr] update translationxin2017-03-083-54/+124
* | | | Merge remote-tracking branch 'xin/translate/install'intrigeri2017-03-121-1/+4
|\ \ \ \
| * | | | [fr] update translationxin2017-03-041-1/+4
* | | | | wiki: fix link to vagrant pageArnaud2017-03-111-1/+1
* | | | | Revert spam.intrigeri2017-03-111-1/+1
* | | | | Revert spam.intrigeri2017-03-111-1/+0
* | | | | text127.0.0.12017-03-101-0/+1
* | | | | This reverts commit fddc0a0d2f80060231d07aeed7f025d7c65b58bb127.0.0.12017-03-101-1/+1
* | | | | Reorder to avoid switching topics back'n'forth.intrigeri2017-03-101-2/+2
* | | | | contribute/how/promote/material: add link to the Git repo.intrigeri2017-03-101-0/+3
| |_|_|/ |/| | |
* | | | Remove UDFs that were never released.anonym2017-03-094-42/+0
| |_|/ |/| |
* | | Calendar: remove past events.intrigeri2017-03-091-14/+0
* | | Calendar: improve formatting.intrigeri2017-03-091-5/+5
* | | Calendar: add 3.0~betaN release at the same time as 2.12.intrigeri2017-03-091-0/+2
* | | Merge remote-tracking branch 'origin/master'sajolida2017-03-08107-452/+3508
|\ \ \
| * \ \ Merge branch 'web/3.0-beta2-announcement'intrigeri2017-03-0815-26/+1182
| |\ \ \