Commits · a3d241020ac69db59b29623732751f5934cf356f · Android-smartphones / Conversations

May 13, 2014
- Merge branch 'beriain-development' into development · a3d24102
  Daniel Gultsch authored May 13, 2014
  
  a3d24102
- Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development · c0f5b26d
  Daniel Gultsch authored May 13, 2014
  
  c0f5b26d
- code cleanup · 71545f4f
  Daniel Gultsch authored May 13, 2014
  
  71545f4f
- Fix · efac008f
  Beriain authored May 13, 2014
  
  efac008f
- Merge https://github.com/siacs/Conversations into development · 8d27d0c4
  Beriain authored May 13, 2014
  
  8d27d0c4
- Update basque translation and include preferences · 1150f47a
  Beriain authored May 13, 2014
  
  1150f47a
- static method for providing content uri · 84e79040
  Daniel Gultsch authored May 13, 2014
  
  84e79040
- ensure that iq response is being send out for jingle packets. remove jingle... · 7e667319
  Daniel Gultsch authored May 13, 2014
```
ensure that iq response is being send out for jingle packets. remove jingle connection from manager after termination
```
  7e667319
- german translation · 3cd369fb
  Daniel Gultsch authored May 13, 2014
  
  3cd369fb
- further translations · f38c7b22
  Daniel Gultsch authored May 13, 2014
  
  f38c7b22
- fixed npe in tag writer · ad9b9b90
  Daniel Gultsch authored May 13, 2014
  
  ad9b9b90
- fixed french language · cce12af7
  Daniel Gultsch authored May 13, 2014
  
  cce12af7
May 12, 2014
- Merge pull request #88 from BenoitBouvarel/development · 32d2efd4
  Daniel Gultsch authored May 12, 2014
```
Translation into French
```
  32d2efd4
- Merge pull request #101 from kruks23/development · dee1ba3b
  Daniel Gultsch authored May 12, 2014
```
Preferences Spanish Translations
```
  dee1ba3b
- Preferences Spanish Translations · ae768598
  kruks23 authored May 12, 2014
  
  ae768598
- Fix a typo in catalan translation · cb706e9e
  alvar authored May 12, 2014
  
  cb706e9e
- Translation into catalan language · d07139d3
  alvar authored May 11, 2014
  
  d07139d3
- fixed parsing error on missing %s · ecea4a5c
  Daniel Gultsch authored May 12, 2014
  
  ecea4a5c
- Update basque translation · 3858715c
  Beriain authored May 12, 2014
  
  3858715c
- Merge https://github.com/siacs/Conversations into development · 75f76950
  Beriain authored May 12, 2014
  
  75f76950
- marked version 0.2 - skipping beta · 4be8280b
  Daniel Gultsch authored May 12, 2014
  
  4be8280b
- added changelog entry · 2fe9bbec
  Daniel Gultsch authored May 12, 2014
  
  2fe9bbec
- Better error handling if attach file doesnt work (on permission denied) · 3455d10a
  Daniel Gultsch authored May 12, 2014
```
and unified encrypted and unencrypted file attachment
```
  3455d10a
May 11, 2014
- transfered preferences descritpions into strings.xml · 4d0bf797
  iNPUTmice authored May 11, 2014
  
  4d0bf797
May 10, 2014
- Merge pull request #93 from kruks23/development · 20dfc32e
  Daniel Gultsch authored May 10, 2014
```
Spanish Translation
```
  20dfc32e
- Delete styles.xml · fcc021aa
  kruks23 authored May 10, 2014
  
  fcc021aa
- Merge remote-tracking branch 'origin/development' into development · 1f32089e
  kruks23 authored May 10, 2014
```
Conflicts:
	res/values-es/arrays.xml
	res/values-es/strings.xml
```
  1f32089e
- Translation into spanish. · 3d913c2e
  kruks23 authored May 10, 2014
  
  3d913c2e
- fixed possible npe and possible exception · 8632954e
  iNPUTmice authored May 10, 2014
  
  8632954e
- #79 First translation into spanish. · 38d3da6c
  kruks23 authored May 06, 2014
  
  38d3da6c
May 09, 2014
- added dialog for otr file transfer · ef0bc671
  Daniel Gultsch authored May 09, 2014
  
  ef0bc671
- Merge branch 'development' of github.com:siacs/Conversations into development · f0eb80eb
  Daniel Gultsch authored May 09, 2014
  
  f0eb80eb
- version 0.2 alpha and changelog · b6fa18a5
  Daniel Gultsch authored May 09, 2014
  
  b6fa18a5
- Merge pull request #91 from the-solipsist/patch-1 · 95504f55
  Daniel Gultsch authored May 09, 2014
```
Corrected spelling of "formerly" in README.md
```
  95504f55
- link to openkeychain from contact details · 3b8446e6
  Daniel Gultsch authored May 09, 2014
  
  3b8446e6
- nicer descriptions in notificaton for images and encrypted messages · a14a2897
  Daniel Gultsch authored May 09, 2014
  
  a14a2897
May 08, 2014
- Corrected spelling of "formerly" in README.me · 536d4cca
  the-solipsist authored May 09, 2014
  
  536d4cca
- Merge pull request #89 from dschuermann/fix-otr-message · b0a0863b
  Daniel Gultsch authored May 08, 2014
```
Improve OTR fingerprint dialog and fix german sentence
```
  b0a0863b
- Improve OTR fingerprint dialog and fix german sentence · 8a2da100
  Dominik Schürmann authored May 08, 2014
  
  8a2da100
- Merge pull request #2 from siacs/development · 30aea387
  Dominik Schürmann authored May 08, 2014
```
2
```
  30aea387