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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
show dynamic tags in contacts activity as well
iNPUTmice
2014-11-18
1
-33
/
+26
*
properly remove conversations context menu
iNPUTmice
2014-11-18
2
-41
/
+20
*
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
*
better exception handling in XmppConnection.connect. (never return without th...
iNPUTmice
2014-11-18
1
-39
/
+15
*
context menu for conversations. fixed #630
iNPUTmice
2014-11-18
1
-9
/
+45
*
clear avatar cache with new roster push from server
iNPUTmice
2014-11-17
1
-0
/
+2
*
avoided some null pointers
iNPUTmice
2014-11-17
3
-24
/
+35
*
context menu for muc participants + refactor trueCounterpart to use Jid class
iNPUTmice
2014-11-17
7
-38
/
+102
*
synchronized around cache clear in avatar service
iNPUTmice
2014-11-17
1
-9
/
+15
*
Use `Locale.US' for string comparisons in search
Sam Whited
2014-11-17
2
-6
/
+14
*
trim search before searching
iNPUTmice
2014-11-17
1
-2
/
+2
*
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-11-17
1
-2
/
+3
|
\
|
*
Fix linter suppression
Sam Whited
2014-11-17
1
-2
/
+3
*
|
split search keywords by whitespaces and imply AND operatior
iNPUTmice
2014-11-17
1
-1
/
+11
|
/
*
highlight muc members by touching their name in muc details. fixed #503
iNPUTmice
2014-11-17
3
-72
/
+105
*
made tags searchable
iNPUTmice
2014-11-16
2
-157
/
+180
*
fixed regression of xmpp uris not working
iNPUTmice
2014-11-16
2
-14
/
+11
*
Merge pull request #673 from SamWhited/development
Daniel Gultsch
2014-11-16
1
-1
/
+1
|
\
|
*
Fix fetching accounts by JIDs
Sam Whited
2014-11-16
1
-1
/
+1
*
|
happy hanukkah
iNPUTmice
2014-11-16
8
-23
/
+132
|
/
*
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-11-16
2
-3
/
+3
|
\
|
*
Don't escape passwords in SASL
Sam Whited
2014-11-15
2
-3
/
+3
*
|
show full time stamp in connection established field
iNPUTmice
2014-11-16
1
-1
/
+1
*
|
better error checking in ssl switch over
iNPUTmice
2014-11-16
1
-5
/
+9
|
/
*
made scan and show qr code more accessible in VerifyOtrActivity
iNPUTmice
2014-11-16
3
-53
/
+186
*
Merge branch 'master' into development
iNPUTmice
2014-11-16
1
-5
/
+18
|
\
|
*
close cursor for database
iNPUTmice
2014-11-16
1
-5
/
+18
|
*
made presences synchronized
iNPUTmice
2014-11-13
1
-13
/
+27
|
*
more npe checks in muc packet parser
iNPUTmice
2014-11-13
1
-32
/
+35
*
|
parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...
iNPUTmice
2014-11-16
11
-69
/
+119
*
|
Merge pull request #669 from SamWhited/scramcaching
Daniel Gultsch
2014-11-15
2
-10
/
+51
|
\
\
|
*
|
Cache SCRAM-SHA-1 keys for current session
Sam Whited
2014-11-15
2
-10
/
+51
*
|
|
small modifications for changing an account status in XmppConnection
iNPUTmice
2014-11-15
1
-8
/
+6
|
/
/
*
|
Merge pull request #668 from SamWhited/auth-pinning
Daniel Gultsch
2014-11-15
17
-280
/
+293
|
\
\
|
*
|
Set security error status on TLS cert mismatch
Sam Whited
2014-11-15
1
-6
/
+7
|
*
|
Remove extra status wrapper method
Sam Whited
2014-11-15
2
-6
/
+1
|
*
|
Add incompatible server status
Sam Whited
2014-11-15
3
-66
/
+18
|
*
|
Add security error status
Sam Whited
2014-11-15
3
-13
/
+21
|
*
|
Make account status an enum
Sam Whited
2014-11-15
13
-200
/
+215
|
*
|
Add auth method pinning
Sam Whited
2014-11-15
6
-16
/
+58
*
|
|
fixed some disco / carbon related bugs
iNPUTmice
2014-11-15
1
-29
/
+43
|
/
/
*
|
Merge branch 'feature/file_transfer' into development
iNPUTmice
2014-11-15
20
-272
/
+755
|
\
\
|
*
|
handled more error cases
iNPUTmice
2014-11-15
2
-5
/
+29
|
*
|
better cleanup after unsuccesful transfers
iNPUTmice
2014-11-15
3
-1
/
+35
|
*
|
fixed description in notifications and conversation overview
iNPUTmice
2014-11-15
7
-50
/
+91
|
*
|
fixed resending for files as well
iNPUTmice
2014-11-15
2
-3
/
+4
|
*
|
made file transfers cancelable
iNPUTmice
2014-11-15
6
-21
/
+71
|
*
|
adepted conversationadapter to deal with files
iNPUTmice
2014-11-15
1
-3
/
+21
|
*
|
progress for ibb transfers
iNPUTmice
2014-11-15
5
-13
/
+27
[next]