1ff9293
fix for concurrency issue
iNPUTmice created
Commit log
d9182fe
Update basque translation
Aitor Beriain created
3d8a2e7
Merge branch 'development' of https://github.com/siacs/Conversations into development
iNPUTmice created
7ba41c6
fixed npe. fixed #717
iNPUTmice created
2f02d8d
create conversation with bare jid
iNPUTmice created
0b8032d
use getAttributeAsJid method
iNPUTmice created
228af52
Merge pull request #716 from kriztan/patch-3
Click to expand commit body
Update german translations
Daniel Gultsch created
e1e28e9
Update german translations
Click to expand commit body
modified translations a bit
kriztan created
7a75a8b
Merge pull request #713 from betheg/muc
Click to expand commit body
MUC: do not add yourself to the muc user list.
Daniel Gultsch created
6f21dc8
Merge pull request #714 from betheg/muc_bookmark_cd
Click to expand commit body
MUC: option to set/delete bookmark in conference details.
Daniel Gultsch created
7ae3e36
Merge pull request #712 from kriztan/patch-2
Click to expand commit body
Update german translation
Daniel Gultsch created
31b539d
MUC: option to set/delete bookmark in conference details.
Michael created
4d84158
Update german translations
kriztan created
dbe8280
add an listener for the muc roster update.
Click to expand commit body
this is for the ConferenceDetailsActivity to show precence updates immediately.
Michael created
bdfdc5f
MUC: do not add yourself to the muc user list.
Michael created
868d9f8
update android gradle plugin to 0.14.4
Click to expand commit body
to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2.
Michael created
49403fd
Merge pull request #709 from kruks23/translation
Click to expand commit body
Update spanish translations
Daniel Gultsch created
ca761ba
Update spanish translations
kruks23 created
28fefad
work around to not confuse irc transport with real conference servers
iNPUTmice created
36f8a31
Merge pull request #706 from betheg/unused_imports
Click to expand commit body
remove unused imports.
Daniel Gultsch created
81a1a48
update action bar with conversations updates as well
iNPUTmice created
97344c0
Merge pull request #707 from betheg/joinmuc
Click to expand commit body
MUC: set from when join muc.
Daniel Gultsch created
febbefe
MUC: set from when join muc.
Michael created
dc0dba3
remove unused imports.
Michael created
424de3e
move task to back and not finish when hitting back button
iNPUTmice created
40ee9b6
Merge pull request #705 from betheg/muc
Click to expand commit body
STATUS_CODE_SELF_PRESENCE is not set in all case.
Daniel Gultsch created
44faec7
STATUS_CODE_SELF_PRESENCE is not set in all case.
Michael created
888475d
additional null pointer saftey checks
iNPUTmice created
de0b36f
verify contacts key only on initiating side of smp
iNPUTmice created
92ad4cb
changed listener timing and cache clearing after muc presences
iNPUTmice created
66abdfc
create file and dirs before creating file
iNPUTmice created
8fe3b29
Merge pull request #698 from kriztan/patch-1
Click to expand commit body
Update german translations
Daniel Gultsch created
3e8a1e5
Merge pull request #699 from betheg/status_code
Click to expand commit body
change status codes string 'number' to a better readable constant.
Daniel Gultsch created
3e3767c
change status codes string 'number' to a better readable constant.
Michael created
13bb46d
Update german translations
kriztan created
a207240
fixed potential NPEs
iNPUTmice created
a142dcc
import fixes
iNPUTmice created
8b10ea6
Merge branch 'development' of https://github.com/siacs/Conversations into development
iNPUTmice created
0ad6d06
brought ad hoc conferences back. fixed #688 fixed #367
iNPUTmice created
6bb0eb0
Merge pull request #696 from SamWhited/development
Click to expand commit body
Remove broken / unused imports
Daniel Gultsch created
73d1843
Remove broken / unused imports
Sam Whited created
e9948f6
sent read marker to full jid
iNPUTmice created
cbf42ee
some saftey checks before registering listeners in XmppActivity
iNPUTmice created
4b9a507
Merge pull request #691 from kruks23/development
Click to expand commit body
Update spanish translation
Daniel Gultsch created
393807a
Merge pull request #692 from kriztan/patch-3
Click to expand commit body
Update german translations
Daniel Gultsch created
c2c3923
Merge pull request #694 from beriain/development
Click to expand commit body
Update basque translation
Daniel Gultsch created
24b5d0e
Update basque translation
Aitor Beriain created
6847594
Update german translations
kriztan created
3ccee22
Update spanish translations
kruks23 created
8f33f35
Update spanish translations
kruks23 created