Commits · 19821516308fda2ba49e27926fbf2a20495f850b · Android-smartphones / Conversations

Jun 01, 2014
- linked openkeychain install dialog from decrypt messages box · 19821516
  iNPUTmice authored Jun 01, 2014
  
  19821516
- changed roster to concurrent hashmap · c17db8e3
  iNPUTmice authored Jun 01, 2014
  
  c17db8e3
- unified crypto messages and made lock icon work for conferences · 32a21e1a
  iNPUTmice authored Jun 01, 2014
  
  32a21e1a
- added warning when public keys are missing · 8ea73fee
  iNPUTmice authored Jun 01, 2014
  
  8ea73fee
- Merge pull request #168 from strb/mucicons · 304f8672
  Daniel Gultsch authored Jun 01, 2014
```
Fix tile rendering for larger conferences
```
  304f8672
- Fix tile rendering for larger conferences · f1505f9f
  Andreas Straub authored Jun 01, 2014
  
  f1505f9f
- show dialog when no contact in a muc has pgp support · 1a4b1f8a
  iNPUTmice authored Jun 01, 2014
  
  1a4b1f8a
- OpenPGP key display in muc details is now prettier and linked to openkeychain · 5d0e1374
  iNPUTmice authored Jun 01, 2014
  
  5d0e1374
- Merge pull request #167 from alethea/up-navigation · ca49603c
  Daniel Gultsch authored Jun 01, 2014
```
Up navigation
```
  ca49603c
May 31, 2014
- Removed TASK_ON_HOME flag from intent created from share · 97957bcf
  Alethea Butler authored May 31, 2014
  
  97957bcf
- Made the navigateUp override behave like a navigate up · d67d7924
  Alethea Butler authored May 31, 2014
  
  d67d7924
- Refactored into onNavigateUp · b04fd233
  Alethea Butler authored May 31, 2014
  
  b04fd233
- Made ConversationActivity singleTask · 04977aed
  Alethea Butler authored May 31, 2014
  
  04977aed
- Merge branch 'development' of github.com:siacs/Conversations into development · 15096aa0
  iNPUTmice authored May 31, 2014
  
  15096aa0
- Merge pull request #164 from alethea/development · 1ffba8bd
  Daniel Gultsch authored May 31, 2014
```
Fix home button up navigation
```
  1ffba8bd
- fixed regression that led to the wakelock not being released again · 57ded7ee
  iNPUTmice authored May 31, 2014
  
  57ded7ee
- Merge pull request #165 from alethea/openpgp-capitalization · 4cf7a845
  Daniel Gultsch authored May 31, 2014
```
Capitalized openPGP to OpenPGP
```
  4cf7a845
- Capitalized openPGP -> OpenPGP · 3e9627dc
  Alethea Butler authored May 31, 2014
  
  3e9627dc
- Up button goes to contacts after initial setup · 0edfd361
  Alethea Butler authored May 30, 2014
  
  0edfd361
- Disabled the Home button when it's not the Up button · 78686e9b
  Alethea Butler authored May 30, 2014
  
  78686e9b
May 30, 2014
- Merge pull request #153 from 9034725985/patch-1 · b763d7ad
  Daniel Gultsch authored May 30, 2014
```
Update README.md
```
  b763d7ad
- Merge pull request #160 from alethea/development · 6f2a0c01
  Daniel Gultsch authored May 30, 2014
```
Spelling and changed "unsuccessful delivery" to "delivery failed"
```
  6f2a0c01
- Merge pull request #157 from kruks23/development · 1a9e97c3
  Daniel Gultsch authored May 30, 2014
```
More harcoded translations + updated Spanish
```
  1a9e97c3
- Changed "unsuccessful delivery" to "delivery failed" · cb127add
  Alethea Butler authored May 30, 2014
  
  cb127add
- Added question mark to remove_contact_text · 732848fc
  Alethea Butler authored May 30, 2014
  
  732848fc
May 29, 2014
- More harcoded translations + updated Spanish · 75b14a1d
  kruks23 authored May 29, 2014
  
  75b14a1d
May 28, 2014
- display pgp key id in muc details and use keys to encrypt groupchat · 655565ec
  Daniel Gultsch authored May 22, 2014
  
  655565ec
- encrypted group messages are now properly decrypted · b605577c
  Daniel Gultsch authored May 22, 2014
  
  b605577c
- first tries on crypto muc · fd4897e1
  Daniel Gultsch authored May 22, 2014
  
  fd4897e1
- Merge branch 'development' of github.com:siacs/Conversations into development · f4ce5082
  iNPUTmice authored May 28, 2014
  
  f4ce5082
- possible fix for #149 and #142 · e348afac
  iNPUTmice authored May 28, 2014
  
  e348afac
May 26, 2014
- Update README.md · 2a3c6ff1
  Kushal authored May 26, 2014
```
just a spelling update... btw, what is a carbonated message?
```
  2a3c6ff1
- Merge pull request #147 from kruks23/development · 3e3967b7
  Daniel Gultsch authored May 26, 2014
```
Fix Contact Status width in contact details
```
  3e3967b7
- Merge pull request #152 from beriain/development · a8589925
  Daniel Gultsch authored May 26, 2014
```
Update basque translation
```
  a8589925
- fixed #151 · a0d21211
  iNPUTmice authored May 26, 2014
  
  a0d21211
- Update strings.xml · 10aa9353
  Aitor Beriain authored May 26, 2014
```
Some strings were untranslated in the previous commit
```
  10aa9353
- Update strings.xml · c4e45458
  Aitor Beriain authored May 26, 2014
  
  c4e45458
May 24, 2014
- Fix Contact Status width in contact details · 1b6a07e3
  kruks23 authored May 24, 2014
  
  1b6a07e3
- error msg on offline subscription changes · 7f825f80
  Daniel Gultsch authored May 24, 2014
  
  7f825f80
- Merge pull request #146 from kruks23/development · 03854f30
  Daniel Gultsch authored May 24, 2014
```
More harcoded translations + Spanish
```
  03854f30