Commits · 3c4ee8286a4fc838987cf92d985a1f515b09240e · tails / tails

20 Jul, 2014 25 commits
- Merge branch 'master' into testing · 3c4ee828
  Tails developers authored Jul 20, 2014
  
  3c4ee828
- Fix broken translation. · aae53dea
  Tails developers authored Jul 20, 2014
  
  aae53dea
- Fix filenames · 90a47e3b
  Tails developers authored Jul 20, 2014
  
  90a47e3b
- Merge remote-tracking branch 'origin/bugfix/7175-openjdk-7' into testing · 93f3998b
  Tails developers authored Jul 20, 2014
  
  93f3998b
- Fixed in 1.1~rc1. · c123c6c4
  Tails developers authored Jul 20, 2014
  
  c123c6c4
- Merge remote-tracking branch 'origin/master' into testing · 3ae92843
  Tails developers authored Jul 20, 2014
```
Conflicts:
	wiki/src/support/known_issues.de.po
	wiki/src/support/known_issues.fr.po
	wiki/src/support/known_issues.pt.po
```
  3ae92843
- greeter mockups: update guided configuration · 6692f2be
  Tails developers authored Jul 20, 2014
  
  6692f2be
- greeter mockups: update flow · 15aa2643
  Tails developers authored Jul 20, 2014
  
  15aa2643
- greeter mockups: update advanced screen · d6174e25
  Tails developers authored Jul 20, 2014
  
  d6174e25
- Merge remote-tracking branch 'origin/bugfix/7605-fix-emulator-path' into testing · e04ad002
  Tails developers authored Jul 20, 2014
  
  e04ad002
- Merge remote-tracking branch 'origin/bugfix/7594-remove-unsafe-browser-bookmarks' into testing · 138253de
  Tails developers authored Jul 20, 2014
  
  138253de
- Merge remote-tracking branch 'origin/master' · 34592471
  Tails developers authored Jul 20, 2014
  
  34592471
- greeter mockups: update 1st screen · 7a58fb03
  Tails developers authored Jul 20, 2014
  
  7a58fb03
- updated PO files · 7d6a1707
  amnesia authored Jul 20, 2014
  
  7d6a1707
- Add another workaround. · 6fe24b1c
  Tails developers authored Jul 20, 2014
  
  6fe24b1c
- Merge remote-tracking branch 'origin/master' · 3e6fc72c
  Tails developers authored Jul 20, 2014
  
  3e6fc72c
- Merge remote-tracking branch 'origin/master' into testing · f1c6b215
  Tails developers authored Jul 20, 2014
```
Conflicts:
	wiki/src/doc/first_steps/persistence/change_passphrase.pt.po
	wiki/src/doc/first_steps/persistence/copy.pt.po
	wiki/src/doc/first_steps/persistence/use.pt.po
```
  f1c6b215
- updated PO files · 8741d0cd
  amnesia authored Jul 20, 2014
  
  8741d0cd
- Merge branch 'master' of ssh://webmasters.boum.org/~/wiki · 02fdb265
  Tails developers authored Jul 20, 2014
  
  02fdb265
- Update signing key. · ba7fc49a
  Tails developers authored Jul 20, 2014
```
Postponed expiration date, imported lots of certifications.
```
  ba7fc49a
- Reformat. · 0ee2ecfc
  Tails developers authored Jul 20, 2014
  
  0ee2ecfc
- updated PO files · 3f72f602
  amnesia authored Jul 20, 2014
  
  3f72f602
- Update Schleuder mailing-list key. · 117c662f
  Tails developers authored Jul 20, 2014
```
Expiration date postponed, and imported lots of new certifications.
```
  117c662f
- Merge branch 'master' of ssh://webmasters.boum.org/~/wiki · 64bceef8
  Tails developers authored Jul 20, 2014
  
  64bceef8
- Make it clear what branch doc work must be based on. · 5419412c
  Tails developers authored Jul 20, 2014
  
  5419412c
19 Jul, 2014 15 commits
- + todo/discuss · cbbcbfa5
  127.0.0.1 authored Jul 19, 2014
  
  cbbcbfa5
- Merge branch 'master' of ssh://webmasters.boum.org/~/wiki · 385092d1
  Tails developers authored Jul 19, 2014
  
  385092d1
- Add monthly meeting agenda placeholder · df95391f
  Tails developers authored Jul 19, 2014
  
  df95391f
- updated PO files · 1ac48797
  amnesia authored Jul 19, 2014
  
  1ac48797
- Add press appearances · 6c6c93e1
  Tails developers authored Jul 19, 2014
  
  6c6c93e1
- Order alphabetically · 9e976e1b
  Tails developers authored Jul 16, 2014
  
  9e976e1b
- Add tails-support to frontdesk moderation task · 1c5f51c7
  Tails developers authored Jul 16, 2014
  
  1c5f51c7
- We want to keep user support out of tails@boum.org · 2ed8e404
  Tails developers authored Jul 16, 2014
  
  2ed8e404
- Frontdesk is now responsible for administering some public mailing lists · b064322b
  Tails developers authored Jul 16, 2014
  
  b064322b
- Fix grammar · 817b8ed5
  Tails developers authored Jul 16, 2014
  
  817b8ed5
- Reformat frontdesk role · 3acbbe23
  Tails developers authored Jul 16, 2014
```
The list was becoming long, so it is now structured in three sections.
```
  3acbbe23
- Update first steps persistence translation to pt-br. · 892f57bf
  Tails developers authored Jul 17, 2014
  
  892f57bf
- Update and improve browser release process. · 76db28b3
  Tails developers authored Jul 19, 2014
  
  76db28b3
- Suggest adding the ticket number in the topic branch name. · 79d7628e
  Tails developers authored Jul 19, 2014
  
  79d7628e
- Also look at changes brought by merge commits. · 19149c4e
  Tails developers authored Jul 19, 2014
  
  19149c4e