moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-20 22:48:52 -05:00
Code Issues Releases Wiki Activity
4,055 Commits 5 Branches 73 Tags 39 MiB
b4318996ac
Commit Graph

4055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iNPUTmice
dc50e0a7e3 fixed regression with newly created conversations not being shown properly 2014-06-04 19:25:53 +02:00
iNPUTmice
7e4e7426ee received and displayed messages (xep 333) are now marked properly 2014-06-04 18:44:15 +02:00
iNPUTmice
ba2ad82c7e more bug fixes for the pgp problem 2014-06-04 12:31:19 +02:00
iNPUTmice
2f2aa7aa21 fixed pgp on incoming carbon messages 2014-06-04 11:55:38 +02:00
iNPUTmice
657df84155 Merge branch 'feature/xep-0333' into development 2014-06-03 15:50:32 +02:00
iNPUTmice
cedc1f40b3 answer to xep 184 message receipts. fixes #95 2014-06-03 15:48:51 +02:00
Daniel Gultsch
41dde747c2 Merge pull request #176 from imaginator/patch-1 
small typo
 2014-06-03 15:11:38 +02:00
Simon Tennant
f7bf62171f small type 2014-06-03 15:06:35 +02:00
iNPUTmice
99793fa909 version bump to 0.3 2014-06-03 11:18:42 +02:00
iNPUTmice
4e82f4337e added pgp sig on muc rename 2014-06-03 11:04:17 +02:00
iNPUTmice
3db0f688fb Merge branch 'development' of github.com:siacs/Conversations into development 2014-06-02 21:27:58 +02:00
iNPUTmice
5b6140dc64 long press on images revails share with intent 2014-06-02 21:27:40 +02:00
Daniel Gultsch
7e1e080eb6 Merge pull request #169 from alethea/self-typo 
Fixed typo in source
 2014-06-02 00:28:54 +02:00
Alethea Rose Butler
5881fc0412
Fixed typo in source "sefl" -> "self" 2014-06-01 17:45:20 -04:00
iNPUTmice
236453295c version bump 2014-06-01 19:53:36 +02:00
iNPUTmice
f94254de16 updated changelog and readme for the 0.3 release 2014-06-01 19:48:44 +02:00
iNPUTmice
1982151630 linked openkeychain install dialog from decrypt messages box 2014-06-01 19:29:57 +02:00
iNPUTmice
c17db8e34e changed roster to concurrent hashmap 2014-06-01 19:17:05 +02:00
iNPUTmice
32a21e1ab9 unified crypto messages and made lock icon work for conferences 2014-06-01 19:08:42 +02:00
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