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
path:
root
/
src
/
main
/
java
/
eu
/
siacs
/
conversations
/
ui
/
adapter
/
ListItemAdapter.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)
trz/merge_1.12.4
lookshe
2016-05-26
1
-2
/
+3
|
\
|
*
properly cancel avatar tasks
Daniel Gultsch
2016-04-29
1
-2
/
+3
|
*
expert setting to manually change presence
Daniel Gultsch
2016-04-22
1
-1
/
+1
*
|
Merge tag '1.10.1' into trz/merge_1.10.1
steckbrief
2016-02-28
1
-2
/
+2
|
\
|
|
*
optionally lock conference domains as well and hide known domains in ui
Daniel Gultsch
2016-02-24
1
-2
/
+2
*
|
Imports organized
steckbrief
2016-02-12
1
-17
/
+13
*
|
Merge tag '1.9.3' into trz/merge_1.9.3
lookshe
2016-02-11
1
-2
/
+5
|
\
|
|
*
hide jid row in list item list when jid is null
Daniel Gultsch
2016-01-26
1
-1
/
+2
|
*
code clean up
Daniel Gultsch
2015-10-12
1
-1
/
+1
|
*
Optimize imports
Andreas Straub
2015-07-20
1
-10
/
+10
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-13
1
-2
/
+5
|
\
\
*
|
|
Merge trz/rename into trz/rebase
steckbrief
2015-10-22
1
-4
/
+2
|
\
|
|
|
*
|
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
steckbrief
2015-06-19
1
-181
/
+0
|
|
/
*
|
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
1
-0
/
+1
*
|
Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference
steckbrief
2015-06-19
1
-2
/
+4
*
|
Status color added to "create conversation" (refers to ticket #22 in flyspray)
steckbrief
2015-06-19
1
-0
/
+4
|
/
*
properly remove invalid avatar
iNPUTmice
2015-02-22
1
-0
/
+1
*
always call to cancel before loading new avatars
iNPUTmice
2015-02-18
1
-12
/
+14
*
fixed avatar cache lookup in ListItemAdapter
iNPUTmice
2015-02-16
1
-4
/
+1
*
made image view background more colorful while waiting on actual avatar to load
iNPUTmice
2015-02-15
1
-1
/
+2
*
loading avatars in seperate tasks
iNPUTmice
2015-02-15
1
-2
/
+89
*
click on dynamic tag to filter for that tag
Daniel Gultsch
2015-01-02
1
-0
/
+22
*
further npe checks
iNPUTmice
2014-12-03
1
-5
/
+11
*
happy hanukkah
iNPUTmice
2014-11-16
1
-0
/
+21
*
Update more files to use JID objects
Sam Whited
2014-11-09
1
-1
/
+1
*
Merge branch 'gradle' into development
Sam Whited
2014-10-30
1
-1
/
+1
*
Make conversations the root project
Sam Whited
2014-10-22
1
-0
/
+44
