Commits · 3455d10a4a87916bfe5da52ca9c401dafa8d5155 · Android-smartphones / Conversations

May 12, 2014
- 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
- sending text message after returing from pending intent · c555a9d0
  Daniel Gultsch authored May 08, 2014
  
  c555a9d0
- better flow after returning from openkeychain for various actions · 7fa61564
  Daniel Gultsch authored May 08, 2014
  
  7fa61564
- Merge pull request #1 from siacs/development · 1b2ce1a3
  Dominik Schürmann authored May 08, 2014
```
pull
```
  1b2ce1a3
- offer to announce pgp key if pgp encryption is selected from menu · 99a56a2b
  Daniel Gultsch authored May 08, 2014
  
  99a56a2b
- more informative dialog if contact doesn't announce public key · 0ed29c1c
  Daniel Gultsch authored May 08, 2014
  
  0ed29c1c
- code cleanup · dc73a25a
  Daniel Gultsch authored May 08, 2014
  
  dc73a25a
- fixed download button on pgp images · 0d8bf660
  Daniel Gultsch authored May 08, 2014
  
  0d8bf660
May 07, 2014
- Merge pull request #87 from dschuermann/development · f4330b3a
  Daniel Gultsch authored May 07, 2014
```
Use git submodule with openpgp-api-lib only
```
  f4330b3a
- Use git submodule with openpgp-api-lib only · fa81beac
  Dominik Schürmann authored May 07, 2014
  
  fa81beac
- updated readme · 02e8db4f
  Daniel Gultsch authored May 07, 2014
  
  02e8db4f
- fixed #70 #65 · 5a407c76
  Daniel Gultsch authored May 07, 2014
  
  5a407c76
- improved next encryption selection · daa000dd
  Daniel Gultsch authored May 07, 2014
  
  daa000dd
- remembering text. awesome · 247f45f4
  Daniel Gultsch authored May 07, 2014
  
  247f45f4
- correct status after error iq · 12a3865c
  Daniel Gultsch authored May 07, 2014
  
  12a3865c
- wee bit of code cleanup · 955b7dbc
  Daniel Gultsch authored May 07, 2014
  
  955b7dbc
May 06, 2014
- basic german translation · 6b20a213
  Daniel Gultsch authored May 06, 2014
  
  6b20a213
- Merge pull request #80 from beriain/development · 2b37dfbe
  Daniel Gultsch authored May 06, 2014
```
Add Basque and Spanish translations
```
  2b37dfbe
- basic pgp encrypted file transfer · 461f2ffb
  Daniel Gultsch authored May 06, 2014
  
  461f2ffb
- #79 First translation into spanish. · 0578fb38
  kruks23 authored May 06, 2014
  
  0578fb38
- Merge https://github.com/siacs/Conversations into development · b8023b4d
  Beriain authored May 06, 2014
  
  b8023b4d
- Update basque and spanish translations · 86887274
  Beriain authored May 06, 2014
  
  86887274
May 03, 2014
- content name and creator are properly set · f7033cb7
  Daniel Gultsch authored May 03, 2014
  
  f7033cb7