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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
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
*
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
|
*
some mime and pgp fixes for file transfer
iNPUTmice
2014-11-15
6
-73
/
+70
|
*
support for pgp files
iNPUTmice
2014-11-15
5
-23
/
+38
|
*
progress for http images as well. fixed open button for sent files
iNPUTmice
2014-11-15
6
-7
/
+38
|
*
copy non local files to private storage first
iNPUTmice
2014-11-15
3
-23
/
+77
|
*
bug fixes and various improvements for file transfer
iNPUTmice
2014-11-15
5
-19
/
+30
|
*
basic arbitrary file transfer
iNPUTmice
2014-11-15
11
-133
/
+326
*
|
Merge branch 'feature/foreground_service' into development
iNPUTmice
2014-11-15
3
-9
/
+41
|
\
\
|
*
|
added low priority and removed date in foreground noticfication
iNPUTmice
2014-11-15
1
-0
/
+2
|
*
|
turn on foreground service in expert settings
iNPUTmice
2014-11-15
3
-9
/
+39
|
|
/
*
|
Merge branch 'feature/otr_verification' into development
iNPUTmice
2014-11-15
6
-122
/
+445
|
\
\
|
|
/
|
/
|
|
*
check if account is online before doing smp
feature/otr_verification
iNPUTmice
2014-11-12
1
-11
/
+24
|
*
Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversat...
iNPUTmice
2014-11-11
1
-1
/
+0
|
|
\
|
|
*
small bug fix
iNPUTmice
2014-11-10
1
-8
/
+3
|
|
*
added snackbar to indicate smp. more error handling in verify activity
iNPUTmice
2014-11-10
3
-113
/
+144
|
|
*
initial smp support
iNPUTmice
2014-11-10
6
-62
/
+356
|
*
|
use auto register for verify otr listeners
iNPUTmice
2014-11-11
1
-9
/
+0
|
*
|
small bug fix
iNPUTmice
2014-11-11
1
-8
/
+3
|
*
|
added snackbar to indicate smp. more error handling in verify activity
iNPUTmice
2014-11-11
3
-113
/
+144
|
*
|
initial smp support
iNPUTmice
2014-11-11
6
-62
/
+356
*
|
|
Improve auth error handling and state machine
Sam Whited
2014-11-15
5
-40
/
+43
*
|
|
Add SCRAM-SHA1 support
Sam Whited
2014-11-14
9
-381
/
+726
*
|
|
Added check for empty from on group chat packet
Kevin Rauwolf
2014-11-14
1
-0
/
+3
*
|
|
fixed possible npe when loading null counterpart into message
iNPUTmice
2014-11-14
1
-1
/
+6
*
|
|
made presences synchronized
iNPUTmice
2014-11-13
1
-13
/
+27
*
|
|
more npe checks in muc packet parser
iNPUTmice
2014-11-13
1
-31
/
+34
*
|
|
Merge pull request #656 from SamWhited/authrefactor
Daniel Gultsch
2014-11-12
5
-88
/
+145
|
\
\
\
|
*
|
|
Refactor authentication code
Sam Whited
2014-11-12
5
-88
/
+145
|
|
/
/
*
/
/
Make sure we're storing the display JID as Unicode
Sam Whited
2014-11-12
1
-2
/
+3
|
/
/
*
|
auto register/unregister listeners
iNPUTmice
2014-11-11
7
-345
/
+289
*
|
temporarliy got rid of some insane work arounds in favor of some maybe less i...
iNPUTmice
2014-11-11
3
-14
/
+17
|
/
*
made Jid class parse otr session ids
iNPUTmice
2014-11-10
1
-0
/
+10
*
more refactoring for presence selection. removed getTo, getFrom and getJid fr...
iNPUTmice
2014-11-10
8
-274
/
+283
*
fixed private messages
iNPUTmice
2014-11-09
1
-2
/
+2
*
s/getResourcepart().isEmpty()/isBareJid()/
Sam Whited
2014-11-09
5
-7
/
+7
*
use isBareJid instead of getResourcePart().isEmpty()
iNPUTmice
2014-11-09
2
-2
/
+2
*
fixed muc sender history for some cases (where the previous nick was a valid ...
iNPUTmice
2014-11-09
2
-8
/
+17
*
migrated some otr stuff to new jid classes
iNPUTmice
2014-11-09
2
-79
/
+82
*
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-11-09
27
-106
/
+102
|
\
[next]