Commit graph

1586 commits

Author SHA1 Message Date
iNPUTmice 8ea73feec4 added warning when public keys are missing 2014-06-01 18:52:27 +02:00
Daniel Gultsch 304f8672d9 Merge pull request #168 from strb/mucicons
Fix tile rendering for larger conferences
2014-06-01 18:37:47 +02:00
Andreas Straub f1505f9f36 Fix tile rendering for larger conferences 2014-06-01 16:30:21 +02:00
iNPUTmice 1a4b1f8a2f show dialog when no contact in a muc has pgp support 2014-06-01 11:24:35 +02:00
iNPUTmice 5d0e1374b2 OpenPGP key display in muc details is now prettier and linked to openkeychain 2014-06-01 10:22:42 +02:00
Daniel Gultsch ca49603c85 Merge pull request #167 from alethea/up-navigation
Up navigation
2014-06-01 09:55:40 +02:00
Alethea Butler 97957bcfb9 Removed TASK_ON_HOME flag from intent created from share 2014-05-31 13:33:46 -04:00
Alethea Butler d67d792409 Made the navigateUp override behave like a navigate up 2014-05-31 12:53:23 -04:00
Alethea Butler b04fd2337e Refactored into onNavigateUp 2014-05-31 11:50:09 -04:00
Alethea Butler 04977aedc4 Made ConversationActivity singleTask 2014-05-31 11:07:55 -04:00
iNPUTmice 15096aa0dd Merge branch 'development' of github.com:siacs/Conversations into development 2014-05-31 11:55:24 +02:00
Daniel Gultsch 1ffba8bd62 Merge pull request #164 from alethea/development
Fix home button up navigation
2014-05-31 11:55:17 +02:00
iNPUTmice 57ded7ee58 fixed regression that led to the wakelock not being released again 2014-05-31 11:54:32 +02:00
Daniel Gultsch 4cf7a84576 Merge pull request #165 from alethea/openpgp-capitalization
Capitalized openPGP to OpenPGP
2014-05-31 07:54:03 +02:00
Alethea Butler 3e9627dc50 Capitalized openPGP -> OpenPGP 2014-05-31 00:11:47 -04:00
Alethea Butler 0edfd36195 Up button goes to contacts after initial setup 2014-05-30 23:41:44 -04:00
Alethea Butler 78686e9bce Disabled the Home button when it's not the Up button 2014-05-30 23:18:50 -04:00
Daniel Gultsch b763d7ad56 Merge pull request #153 from 9034725985/patch-1
Update README.md
2014-05-30 12:37:23 +02:00
Daniel Gultsch 6f2a0c0107 Merge pull request #160 from alethea/development
Spelling and changed "unsuccessful delivery" to "delivery failed"
2014-05-30 12:36:38 +02:00
Daniel Gultsch 1a9e97c314 Merge pull request #157 from kruks23/development
More harcoded translations + updated Spanish
2014-05-30 12:35:59 +02:00
Alethea Butler cb127add56 Changed "unsuccessful delivery" to "delivery failed" 2014-05-30 02:04:24 -04:00
Alethea Butler 732848fc0e Added question mark to remove_contact_text 2014-05-30 02:03:24 -04:00
kruks23 75b14a1d5c More harcoded translations + updated Spanish 2014-05-29 18:17:21 +02:00
Daniel Gultsch 655565eccc display pgp key id in muc details and use keys to encrypt groupchat 2014-05-28 10:41:55 +02:00
Daniel Gultsch b605577cd9 encrypted group messages are now properly decrypted 2014-05-28 10:41:55 +02:00
Daniel Gultsch fd4897e1a5 first tries on crypto muc 2014-05-28 10:41:55 +02:00
iNPUTmice f4ce5082b9 Merge branch 'development' of github.com:siacs/Conversations into development 2014-05-28 10:38:12 +02:00
iNPUTmice e348afac54 possible fix for #149 and #142 2014-05-28 10:37:49 +02:00
Kushal 2a3c6ff1e4 Update README.md
just a spelling update... btw, what is a carbonated message?
2014-05-26 15:04:11 -05:00
Daniel Gultsch 3e3967b785 Merge pull request #147 from kruks23/development
Fix Contact Status width in contact details
2014-05-26 18:46:51 +02:00
Daniel Gultsch a858992586 Merge pull request #152 from beriain/development
Update basque translation
2014-05-26 18:46:12 +02:00
iNPUTmice a0d21211e1 fixed #151 2014-05-26 18:44:26 +02:00
Aitor Beriain 10aa935331 Update strings.xml
Some strings were untranslated in the previous commit
2014-05-26 17:30:15 +02:00
Aitor Beriain c4e45458fb Update strings.xml 2014-05-26 17:27:03 +02:00
kruks23 1b6a07e380 Fix Contact Status width in contact details 2014-05-24 15:37:54 +02:00
Daniel Gultsch 7f825f8027 error msg on offline subscription changes 2014-05-24 11:17:55 +02:00
Daniel Gultsch 03854f30c9 Merge pull request #146 from kruks23/development
More harcoded translations + Spanish
2014-05-24 10:03:42 +02:00
Daniel Gultsch 00377b64c7 Merge pull request #140 from strb/mucicons
Refactored unknown contact picture generation
2014-05-24 10:01:51 +02:00
kruks23 d74faa3f7c More harcoded translations + Spanish 2014-05-24 00:17:42 +02:00
Daniel Gultsch 600ab81010 Merge pull request #145 from kruks23/development
Title activities translations + contacts translations + update Spanish
2014-05-23 16:58:58 +02:00
kruks23 d6fd0343ae Title activities translations + contacts translations + update Spanish Translations 2014-05-23 16:20:49 +02:00
Daniel Gultsch a0dde05ee5 end otr sessions earlier / more often. can lead to unesessary handshakes but can improve reliabilty 2014-05-23 10:54:40 +02:00
Daniel Gultsch 8133dcd881 fixed possible npe 2014-05-23 10:15:58 +02:00
Daniel Gultsch a5d54d70ee code cleanup 2014-05-23 10:07:17 +02:00
Daniel Gultsch f3eb3e1be3 updated readme 2014-05-23 09:59:30 +02:00
Daniel Gultsch a2ae6e80fa Merge pull request #143 from nachovfranco/mycommits
Galician translation
2014-05-23 09:57:20 +02:00
Daniel Gultsch a4bc6f1e47 Merge pull request #144 from kruks23/development
Contact details translations + update spanish translations
2014-05-23 02:22:14 +02:00
kruks23 950165033b Contact details translations + update spanish translations 2014-05-22 22:58:25 +02:00
Daniel Gultsch b99779432c offline crud of contacts 2014-05-22 14:33:17 +02:00
nachovfranco e26c60b9ca Galician translation 2014-05-22 13:10:23 +02:00