moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 11:42:15 -05:00
Code Issues Releases Wiki Activity
1,726 Commits 5 Branches 73 Tags 39 MiB
eb0f8c08bd
Commit Graph

1726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iNPUTmice
eb0f8c08bd safety net in joinMuc 2014-12-03 00:06:57 +01:00
iNPUTmice
39a3f372dd clean up getProposedNick 2014-12-03 00:06:57 +01:00
iNPUTmice
9152e1ac95 fixed potential npes in message parser 2014-12-03 00:06:57 +01:00
iNPUTmice
241de062da cleaned up avatar / tile creation 2014-12-03 00:06:57 +01:00
iNPUTmice
9dd445a507 fixed #728 2014-12-01 12:33:57 +01:00
iNPUTmice
6a429d9939 bumped cap version as well 2014-12-01 11:25:47 +01:00
iNPUTmice
8b5294241a version bump to 0.9.1 and changelog 2014-12-01 11:19:32 +01:00
iNPUTmice
8d306ac64f clear encrypted messages on reinit 2014-12-01 11:18:55 +01:00
iNPUTmice
96bbd16ca5 worked around rare npe 2014-12-01 10:58:06 +01:00
iNPUTmice
5992d4ac00 fixed npe if roster jid couldnt be parsed 2014-12-01 10:25:36 +01:00
iNPUTmice
21f77cd1e3 fixed italian translation 2014-12-01 09:59:39 +01:00
Daniel Gultsch
99e3fb814d Merge pull request #726 from Elinvention/development 
Update Italian translations
 2014-12-01 09:51:19 +01:00
iNPUTmice
a4b4c13c66 do not query service info from main server again 2014-12-01 09:48:30 +01:00
iNPUTmice
57fd763066 don't request fragment before updating 2014-11-30 22:27:11 +01:00
Elinvention
e039c8de25 Removed pref_about_message which is not translatable 2014-11-30 21:51:48 +01:00
Elinvention
6b772f4141 Added missing italian translations with some minor fixes to existing ones 2014-11-30 21:16:55 +01:00
Daniel Gultsch
52a43db6d6 Merge pull request #721 from SamWhited/warning_fixes 
Warning "fixes"
 2014-11-29 19:14:13 +01:00
Daniel Gultsch
acf446a02c Merge pull request #718 from beriain/development 
Update basque translation
 2014-11-29 19:13:26 +01:00
iNPUTmice
d98486d1ca fixed npe for broken bookmarks 2014-11-29 19:09:28 +01:00
iNPUTmice
5d7597438b version bump to 0.9 2014-11-29 17:54:39 +01:00
Sam Whited
e43ac27e8f Accessibility: Add missing image descriptions 2014-11-29 08:03:35 -05:00
Sam Whited
afc673bb15 Misc. "fixes" to correct warnings. 2014-11-29 07:50:59 -05:00
iNPUTmice
1ff9293ee1 fix for concurrency issue 2014-11-29 13:09:56 +01:00
Aitor Beriain
d9182fe81c Update basque translation 2014-11-27 18:33:42 +01:00
iNPUTmice
3d8a2e7923 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-27 10:30:27 +01:00
iNPUTmice
7ba41c6a8e fixed npe. fixed #717 2014-11-27 10:30:06 +01:00
iNPUTmice
2f02d8d398 create conversation with bare jid 2014-11-27 10:26:53 +01:00
iNPUTmice
0b8032dbd6 use getAttributeAsJid method 2014-11-27 10:26:34 +01:00
Daniel Gultsch
228af5271c Merge pull request #716 from kriztan/patch-3 
Update german translations
 2014-11-26 13:04:06 +01:00
kriztan
e1e28e9ef6 Update german translations 
modified translations a bit
 2014-11-26 11:39:40 +01:00
Daniel Gultsch
7a75a8bc5a Merge pull request #713 from betheg/muc 
MUC: do not add yourself to the muc user list.
 2014-11-24 11:53:28 +01:00
Daniel Gultsch
6f21dc84d5 Merge pull request #714 from betheg/muc_bookmark_cd 
MUC: option to set/delete bookmark in conference details.
 2014-11-24 09:31:29 +01:00
Daniel Gultsch
7ae3e36489 Merge pull request #712 from kriztan/patch-2 
Update german translation
 2014-11-24 09:13:58 +01:00
Michael
31b539daf7 MUC: option to set/delete bookmark in conference details. 2014-11-23 21:37:45 +01:00
kriztan
4d841587c8 Update german translations 2014-11-23 15:21:12 +01:00
Michael
dbe8280662 add an listener for the muc roster update. 
this is for the ConferenceDetailsActivity to show
precence updates immediately.
 2014-11-23 15:19:44 +01:00
Michael
bdfdc5fb10 MUC: do not add yourself to the muc user list. 2014-11-23 15:19:07 +01:00
Daniel Gultsch
49403fda84 Merge pull request #709 from kruks23/translation 
Update spanish translations
 2014-11-22 00:42:48 +01:00
kruks23
ca761bac3c Update spanish translations 2014-11-22 00:37:41 +01:00
iNPUTmice
28fefad834 work around to not confuse irc transport with real conference servers 2014-11-21 20:34:19 +01:00
Daniel Gultsch
36f8a31d7d Merge pull request #706 from betheg/unused_imports 
remove unused imports.
 2014-11-21 20:03:46 +01:00
iNPUTmice
81a1a48b8d update action bar with conversations updates as well 2014-11-21 20:02:13 +01:00
Daniel Gultsch
97344c079a Merge pull request #707 from betheg/joinmuc 
MUC: set from when join muc.
 2014-11-21 20:00:25 +01:00
Michael
febbefefa5 MUC: set from when join muc. 2014-11-21 19:37:50 +01:00
Michael
dc0dba3faf remove unused imports. 2014-11-21 19:17:27 +01:00
iNPUTmice
424de3ea3a move task to back and not finish when hitting back button 2014-11-21 18:57:27 +01:00
Daniel Gultsch
40ee9b6a03 Merge pull request #705 from betheg/muc 
STATUS_CODE_SELF_PRESENCE is not set in all case.
 2014-11-21 17:06:12 +01:00
Michael
44faec7051 STATUS_CODE_SELF_PRESENCE is not set in all case. 2014-11-21 16:14:56 +01:00
iNPUTmice
888475d4fe additional null pointer saftey checks 2014-11-21 15:25:57 +01:00
iNPUTmice
de0b36fc78 verify contacts key only on initiating side of smp 2014-11-21 13:42:25 +01:00