Commit graph

1080 commits

Author SHA1 Message Date
iNPUTmice dfbc42ecd7 some fixes for otr with multiple parties 2014-06-25 16:55:47 +02:00
iNPUTmice 5d4efe0826 changed diesys' link 2014-06-24 16:25:37 +02:00
iNPUTmice d23a59f159 Merge branch 'development' of github.com:siacs/Conversations into development 2014-06-24 16:14:32 +02:00
iNPUTmice ea261c1032 more otr fixes 2014-06-24 16:14:18 +02:00
Daniel Gultsch d28d432ff8 Merge pull request #226 from kruks23/development
Update spanish mins ago
2014-06-24 15:27:12 +02:00
iNPUTmice c2ddfded94 added Diego Turtulici to list of contributors 2014-06-24 15:22:36 +02:00
iNPUTmice 6ef9421d35 fixes for offline otr 2014-06-24 15:07:59 +02:00
kruks23 6332591902 Update spanish mins ago 2014-06-24 09:21:46 +02:00
iNPUTmice 2a8f9642d5 added rendering script for artwork 2014-06-24 01:35:43 +02:00
iNPUTmice 6f51cc8554 changed opacity 2014-06-24 01:05:31 +02:00
iNPUTmice dd7f8d28c7 added license file. plus renaming 2014-06-24 00:57:21 +02:00
Daniel Gultsch 11190947b3 Merge pull request #225 from diesys/development
new icons
2014-06-24 00:55:32 +02:00
diesys f2a63713cf Create conversation_mono.svg 2014-06-23 23:30:03 +02:00
iNPUTmice 18d0e57f52 fixed regression with chat markers not working 2014-06-23 23:29:26 +02:00
diesys e4f5a905e9 conversation_baloon.svg 2014-06-23 23:28:43 +02:00
diesys 2aa99ddd39 conversation.svg 2014-06-23 23:27:02 +02:00
iNPUTmice 25e44cbf52 new logo 2014-06-23 21:57:53 +02:00
iNPUTmice d7656dd420 fix for not being able to send otr encrypted images to offline contacts. unconfirmed 2014-06-23 21:48:48 +02:00
iNPUTmice 43e276e325 possible better distribution of contact picture colors 2014-06-23 21:13:58 +02:00
iNPUTmice 996bee8836 enabled otr encryption for ibb filetransfer as well 2014-06-23 16:01:51 +02:00
iNPUTmice c25f1283a1 removed warnings 2014-06-22 21:44:17 +02:00
iNPUTmice 678cc7af10 changelog and version bump to 0.4-beta 2014-06-22 19:53:43 +02:00
iNPUTmice 1374fed31b fixed #220 2014-06-22 18:21:04 +02:00
iNPUTmice fafc5306d7 moved message packet creation into sperate class 2014-06-22 17:24:47 +02:00
iNPUTmice f559bd14dd establish otr connection before sending image 2014-06-22 13:57:57 +02:00
iNPUTmice 6409846379 removed duplicate entries 2014-06-21 22:16:42 +02:00
iNPUTmice ab8b031cc0 Merge branch 'beriain-development' into development 2014-06-20 19:50:03 +02:00
iNPUTmice 545cad41e6 Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development
Conflicts:
	res/values-eu/strings.xml
2014-06-20 19:49:33 +02:00
iNPUTmice 49b7c7779d fixes for otr file transfer 2014-06-20 19:28:47 +02:00
iNPUTmice 1cf055d2fd not working version of otr file transfer 2014-06-20 17:30:19 +02:00
Aitor Beriain b16bc24c71 Update strings.xml 2014-06-18 17:15:59 +02:00
iNPUTmice beafb06b6a clear input field after conference pgp message 2014-06-16 23:43:45 +02:00
iNPUTmice 7e8c68b698 streamlined onpresenceselected listener 2014-06-16 14:21:22 +02:00
iNPUTmice 30a0be2998 fixed bug in intent filter. cleaned share with activity 2014-06-16 14:06:50 +02:00
iNPUTmice 0102032fc5 added share image intent to android manifest for testing purposes 2014-06-16 14:06:50 +02:00
iNPUTmice 41834b5e24 code cleanup / unification 2014-06-16 14:06:34 +02:00
iNPUTmice b9477edb53 cleanup; removed unnecessary imports and log outputs 2014-06-16 12:18:04 +02:00
Daniel Gultsch e6b5713c12 Merge pull request #211 from kruks23/development
Rounded minutes ago and last seen moe exactly
2014-06-15 20:12:40 +02:00
kruks23 febf23de1f Rounded minutes ago and last seen + Update Spanish Translations 2014-06-15 18:27:20 +02:00
Daniel Gultsch 7a164f7639 Merge pull request #209 from mrdomino/development
Send from our full jid (fixes #60)
2014-06-15 15:38:52 +02:00
Steven Dee 473cef32fa Send from our full jid (fixes #60)
The problem wasn't with sending to bare jids, but rather sending
*from* bare jids, which we did unless we were OTR encrypted for
some reason. Google Talk supports the former, but (probably correctly)
rejects the latter.
2014-06-15 05:38:15 -07:00
iNPUTmice 7f1a4a6fb8 infite scrolling 2014-06-14 16:59:07 +02:00
iNPUTmice 7bdee8c19b fixed #197 2014-06-14 14:27:03 +02:00
iNPUTmice 471ed7838a fixed #204 2014-06-14 10:29:26 +02:00
iNPUTmice d067448808 offline sending of images 2014-06-13 18:16:14 +02:00
iNPUTmice 76f3894107 status waiting for images sent offline 2014-06-13 15:05:35 +02:00
iNPUTmice eb7ed78605 moved last seen to contact details 2014-06-13 11:50:47 +02:00
iNPUTmice 899da61555 further bullet proofing 2014-06-13 11:16:52 +02:00
iNPUTmice a92fb88e51 fixed #201 2014-06-13 10:39:44 +02:00
iNPUTmice 592aded106 finished offline otr 2014-06-12 23:04:28 +02:00