Commits · b0a0863ba2c23023b0b04d813b1dc30bd638735e · Android-smartphones / Conversations

May 08, 2014
- 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
- 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
- properly reply to iq requests. reply to disco · 2df57f38
  Daniel Gultsch authored May 03, 2014
  
  2df57f38
- allow roster pushes only from bare jid or null · 4822d4dc
  Daniel Gultsch authored May 03, 2014
  
  4822d4dc
- more cleanup in res files · be2f7e04
  Daniel Gultsch authored May 03, 2014
  
  be2f7e04
- removed unnecessary files · 4893d803
  Daniel Gultsch authored May 03, 2014
  
  4893d803
- added restart button to openkeychain dialog · 3cfb4a0c
  Daniel Gultsch authored May 03, 2014
  
  3cfb4a0c
May 02, 2014
- Add Basque and Spanish translations · 794f9d6c
  Mikel authored May 02, 2014
  
  794f9d6c
- nicer dialog screen if openkeychain is not installed · 82bccedf
  Daniel Gultsch authored May 02, 2014
  
  82bccedf
May 01, 2014
- reworked openpgp integration part #1 · 37c8e157
  Daniel Gultsch authored May 01, 2014
  
  37c8e157
Apr 26, 2014
- bug fix for jingle · 4b66b4b5
  Daniel Gultsch authored Apr 26, 2014
  
  4b66b4b5
- unified presence selection for otr and file transfer · f36f2184
  Daniel Gultsch authored Apr 26, 2014
  
  f36f2184
Apr 25, 2014
- fixed #75 · a55ddb88
  Daniel Gultsch authored Apr 25, 2014
  
  a55ddb88
- setting backround color if image comes directly from cache · 69428400
  Daniel Gultsch authored Apr 25, 2014
  
  69428400
- couple of more optimazations on image loading · 645139eb
  Daniel Gultsch authored Apr 25, 2014
  
  645139eb
- smoother scrolling (first step) · bf2d0d55
  Daniel Gultsch authored Apr 25, 2014
  
  bf2d0d55
Apr 23, 2014
- deny files with unknown file types · 18c183a7
  Daniel Gultsch authored Apr 23, 2014
  
  18c183a7
Apr 22, 2014
- added download button for images not accepted automatically · 9a8e55ac
  Daniel Gultsch authored Apr 22, 2014
  
  9a8e55ac