index
:
conversations
BrianBlade-feature/swipe_out_conversation
CryptoNextAlpha
CryptoNextBeta
JingleFixes
MessageParserNext
UnreadCountBadge
cbe
delay_fixes
development
dnsfixes
feature/file_transfer
feature/foreground_service
feature/http_upload
feature/mam
feature/otr_verification
idn_fixes
issue921
lolipop_dns_server_discovery
master
more_logging_for_view_intent
muc_vcard_avatars
nfc
possible_copperhead_fixes
reworked_host_finder_loop
show_members_in_conference
show_send_button_in_softkeyboard
six_love
slack_workaround
tor_support
travis-fixes
travis_fixes
trz/emojicon-merge
trz/emojicon-new
trz/master
trz/merge_1.10.0
trz/merge_1.10.1
trz/merge_1.11.0
trz/merge_1.11.1
trz/merge_1.11.7
trz/merge_1.12.4
trz/merge_1.5.2
trz/merge_1.6.3
trz/merge_1.9.3
trz/merge_1.9.4
trz/rebase
trz/rename
trz/test
verbose_login_log
copy of conversations repo
lookshe
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
Commit message (
Expand
)
Author
Age
Files
Lines
...
*
|
use getAttributeAsJid method
iNPUTmice
2014-11-27
1
-6
/
+1
|
/
*
Merge pull request #713 from betheg/muc
Daniel Gultsch
2014-11-24
5
-1
/
+65
|
\
|
*
add an listener for the muc roster update.
Michael
2014-11-23
4
-1
/
+63
|
*
MUC: do not add yourself to the muc user list.
Michael
2014-11-23
1
-0
/
+2
*
|
Merge pull request #714 from betheg/muc_bookmark_cd
Daniel Gultsch
2014-11-24
2
-0
/
+49
|
\
\
|
*
|
MUC: option to set/delete bookmark in conference details.
Michael
2014-11-23
2
-0
/
+49
|
|
/
*
|
Merge pull request #712 from kriztan/patch-2
Daniel Gultsch
2014-11-24
1
-0
/
+2
|
\
\
|
|
/
|
/
|
|
*
Update german translations
kriztan
2014-11-23
1
-0
/
+2
|
/
*
Merge pull request #709 from kruks23/translation
Daniel Gultsch
2014-11-22
1
-2
/
+8
|
\
|
*
Update spanish translations
kruks23
2014-11-22
1
-2
/
+8
|
/
*
work around to not confuse irc transport with real conference servers
iNPUTmice
2014-11-21
1
-2
/
+7
*
Merge pull request #706 from betheg/unused_imports
Daniel Gultsch
2014-11-21
12
-38
/
+0
|
\
|
*
remove unused imports.
Michael
2014-11-21
12
-38
/
+0
*
|
update action bar with conversations updates as well
iNPUTmice
2014-11-21
2
-52
/
+45
*
|
Merge pull request #707 from betheg/joinmuc
Daniel Gultsch
2014-11-21
1
-0
/
+1
|
\
\
|
*
|
MUC: set from when join muc.
Michael
2014-11-21
1
-0
/
+1
|
/
/
*
/
move task to back and not finish when hitting back button
iNPUTmice
2014-11-21
1
-7
/
+5
|
/
*
Merge pull request #705 from betheg/muc
Daniel Gultsch
2014-11-21
1
-10
/
+16
|
\
|
*
STATUS_CODE_SELF_PRESENCE is not set in all case.
Michael
2014-11-21
1
-10
/
+16
|
/
*
additional null pointer saftey checks
iNPUTmice
2014-11-21
1
-15
/
+13
*
verify contacts key only on initiating side of smp
iNPUTmice
2014-11-21
4
-7
/
+20
*
changed listener timing and cache clearing after muc presences
iNPUTmice
2014-11-20
1
-6
/
+9
*
create file and dirs before creating file
iNPUTmice
2014-11-20
1
-0
/
+2
*
Merge pull request #698 from kriztan/patch-1
Daniel Gultsch
2014-11-20
1
-16
/
+20
|
\
|
*
Update german translations
kriztan
2014-11-20
1
-16
/
+20
*
|
Merge pull request #699 from betheg/status_code
Daniel Gultsch
2014-11-20
1
-3
/
+5
|
\
\
|
|
/
|
/
|
|
*
change status codes string 'number' to a better readable constant.
Michael
2014-11-20
1
-3
/
+5
|
/
*
fixed potential NPEs
iNPUTmice
2014-11-20
1
-39
/
+43
*
import fixes
iNPUTmice
2014-11-20
1
-0
/
+2
*
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-11-20
1
-3
/
+0
|
\
|
*
Merge pull request #696 from SamWhited/development
Daniel Gultsch
2014-11-19
1
-3
/
+0
|
|
\
|
|
*
Remove broken / unused imports
Sam Whited
2014-11-19
1
-3
/
+0
|
|
/
*
/
brought ad hoc conferences back. fixed #688 fixed #367
iNPUTmice
2014-11-20
13
-137
/
+480
|
/
*
sent read marker to full jid
iNPUTmice
2014-11-19
2
-9
/
+10
*
some saftey checks before registering listeners in XmppActivity
iNPUTmice
2014-11-19
1
-1
/
+12
*
Merge pull request #691 from kruks23/development
Daniel Gultsch
2014-11-19
1
-5
/
+11
|
\
|
*
Update spanish translations
kruks23
2014-11-19
1
-4
/
+4
|
*
Update spanish translations
kruks23
2014-11-18
1
-2
/
+8
*
|
Merge pull request #692 from kriztan/patch-3
Daniel Gultsch
2014-11-19
1
-0
/
+41
|
\
\
|
*
|
Update german translations
kriztan
2014-11-19
1
-0
/
+41
|
|
/
*
|
Merge pull request #694 from beriain/development
Daniel Gultsch
2014-11-19
1
-0
/
+56
|
\
\
|
|
/
|
/
|
|
*
Update basque translation
Aitor Beriain
2014-11-19
1
-0
/
+56
|
/
*
added faq for srv records
iNPUTmice
2014-11-18
1
-0
/
+6
*
put error notification into notification service
iNPUTmice
2014-11-18
7
-46
/
+42
*
simplified message merge condition
iNPUTmice
2014-11-18
1
-43
/
+13
*
synchronized message list in conversation fragment
iNPUTmice
2014-11-18
1
-113
/
+118
*
show dynamic tags in contacts activity as well
iNPUTmice
2014-11-18
2
-45
/
+33
*
properly remove conversations context menu
iNPUTmice
2014-11-18
4
-52
/
+27
*
disabled broken conversations context menu
iNPUTmice
2014-11-18
1
-3
/
+3
*
better usage of synchronized in some places
iNPUTmice
2014-11-18
3
-82
/
+80
[prev]
[next]