summaryrefslogtreecommitdiffstats
path: root/wiki/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into develTails developers2013-07-206-79/+188
|\
| * Fix links.Tails developers2013-07-201-2/+2
| * updated PO filesamnesia2013-07-194-76/+56
| * Remove ugly line breakTails developers2013-07-191-2/+1
| * updated PO filesamnesia2013-07-194-52/+52
| * Merge branch 'master' of ssh://webmasters.boum.org/~/wikiTails developers2013-07-194-115/+243
| |\
| | * updated PO filesamnesia2013-07-194-115/+243
| * | Fix HTML.Tails developers2013-07-191-2/+2
| |/
| * Merge branch 'master' of ssh://webmasters.boum.org/~/wikiTails developers2013-07-191-10/+11
| |\
| * \ Merge remote-tracking branch 'origin/doc/circumvention'Tails developers2013-07-191-7/+9
| |\ \
| | * | Don't use contraction and fix typoTails developers2013-07-161-2/+2
| | * | Rephrase the introTails developers2013-07-161-3/+5
| | * | Mention censorship circumventionTails developers2013-07-161-2/+2
* | | | Merge remote-tracking branch 'origin/master' into develTails developers2013-07-20865-22254/+3159
|\ \ \ \ | | |_|/ | |/| |
| * | | Criteria for easy tasksTails developers2013-07-191-10/+11
| |/ /
| * | Point to the "easy" tasks list.Tails developers2013-07-193-3/+6
| * | Closing.Tails developers2013-07-191-6/+10
| * | Link to custom queries.Tails developers2013-07-191-5/+3
| * | Merge branch 'master' of ssh://webmasters.boum.org/~/wikiTails developers2013-07-1930-0/+1427
| |\ \
| | * | Guidelines on tips, notes, cautions, bugs, and nextTails developers2013-07-191-0/+39
| | * | Resurrect a bunch of blueprints.Tails developers2013-07-1929-0/+1388
| * | | Fix link.Tails developers2013-07-191-1/+1
| |/ /
| * | Merge branch 'master' of ssh://webmasters.boum.org/~/wikiTails developers2013-07-194-8/+8
| |\ \
| | * | updated PO filesamnesia2013-07-194-8/+8
| * | | TODO--Tails developers2013-07-191-50/+3
| * | | Get another blueprint back.Tails developers2013-07-192-0/+236
| |/ /
| * | Merge branch 'master' of ssh://webmasters.boum.org/~/wikiTails developers2013-07-194-81/+81
| |\ \
| | * | updated PO filesamnesia2013-07-194-81/+81
| * | | Add blueprints index page.Tails developers2013-07-192-1/+2
| * | | Get back more blueprints.Tails developers2013-07-192-0/+197
| * | | Get another blueprint back.Tails developers2013-07-194-0/+667
| |/ /
| * | Merge branch 'master' of ssh://webmasters.boum.org/~/wikiTails developers2013-07-199-215/+185
| |\ \
| | * | updated PO filesamnesia2013-07-198-215/+181
| | * | creating tag page tags/category/greeteramnesia2013-07-181-0/+4
| * | | Get blueprints back.Tails developers2013-07-194-0/+214
| * | | TODO++Tails developers2013-07-191-0/+1
| * | | TODO--Tails developers2013-07-191-11/+4
| * | | Resurect blueprint.Tails developers2013-07-183-0/+1719
| * | | Redirect to new roadmap.Tails developers2013-07-181-0/+1
| * | | Update the roadmap page to point to the real one.Tails developers2013-07-182-84/+1
| * | | Move tools before other pages.Tails developers2013-07-181-12/+12
| |/ /
| * | Link to blueprints.Tails developers2013-07-181-0/+2
| * | rm -rf todo/*Tails developers2013-07-18929-26256/+0
| * | TODO++Tails developers2013-07-181-3/+47
| * | Move blueprints to a dedicated directory.Tails developers2013-07-1822-0/+0
| * | Merge branch 'master' into feature/better_task_managerTails developers2013-07-181-12/+28
| |\ \
| | * \ Merge branch 'master' of ssh://webmasters.boum.org/~/wikiTails developers2013-07-18156-87/+246
| | |\ \
| | * | | Update blueprint.Tails developers2013-07-181-12/+28
| * | | | Add rewrite rules to the new tickets URL.Tails developers2013-07-181-0/+879
| * | | | Split ticket.Tails developers2013-07-188-11/+24