moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-15 21:45:07 -05:00
Code Issues Releases Wiki Activity
607 Commits 5 Branches 73 Tags 39 MiB
fafc5306d7
Commit Graph

607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
iNPUTmice
b1482212b8 fire onContactStatusChanged only on online/offline changes. not on status changes 2014-06-12 18:27:50 +02:00
iNPUTmice
18871230e1 send otr messages when contacts comes online 2014-06-12 10:41:47 +02:00
iNPUTmice
e353a1c109 made muc join easier if muc server is known. added room to key words 2014-06-12 09:54:19 +02:00
iNPUTmice
bb90452673 groundwork for offline otr messages 2014-06-11 21:53:25 +02:00
iNPUTmice
95f1a3d57d select presence dialog now suggests last used presence 2014-06-10 17:34:18 +02:00
iNPUTmice
285ffa86e7 fixed scrolling issues 2014-06-10 17:01:19 +02:00
iNPUTmice
2eb2bac3e6 cleanup 2014-06-10 14:12:11 +02:00
Daniel Gultsch
7f5d65c783 Merge pull request #193 from strb/mucicons 
Muc Icon tile color fix
 2014-06-10 13:56:16 +02:00
Andreas Straub
c6ffb85d5f Muc Icon tile color fix 2014-06-10 13:19:17 +02:00
iNPUTmice
28b7a6c92a don't display 'enter password' message if OpenKeychain is not installed. made status messages in chat not selectable 2014-06-09 21:25:01 +02:00
Daniel Gultsch
d0a338f814 Merge pull request #188 from DerHamster/worktest 
small fix ( zerfifikat -> zertifikat )
 2014-06-09 20:24:51 +02:00
iNPUTmice
c92db4e113 updated languages 2014-06-09 20:22:43 +02:00
eric
79f09ccf61 small fix ( zerfifikat -> zertifikat ) 2014-06-09 20:19:08 +02:00
Aitor Beriain
9f48555a18 Update strings.xml 2014-06-09 16:11:30 +02:00
Daniel Gultsch
f5bea48fe6 Merge pull request #186 from kruks23/development 
Update Spanish Translations
 2014-06-09 10:29:00 +02:00
kruks23
777edca0e1 Update Spanish Translations 2014-06-09 01:01:56 +02:00
iNPUTmice
794b13fcfa fixing #184 2014-06-07 19:00:08 +02:00
iNPUTmice
60d0881852 removed unnecessary variable in message class 2014-06-07 14:42:17 +02:00
iNPUTmice
71886ed2ab localized date. rounded minutes, hours and dates in last seen 2014-06-07 13:57:03 +02:00
iNPUTmice
ea8f3a2675 possible fix to be able to images and encrypted messages at a faster rate 2014-06-07 13:25:27 +02:00
iNPUTmice
df7f7c5c4e do not just simply resend images 2014-06-06 20:06:06 +02:00
iNPUTmice
3fd371cd53 fixed last_seen_now 2014-06-06 19:39:55 +02:00
iNPUTmice
fc656c5571 removed presence from last seen 2014-06-06 19:37:34 +02:00