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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
...
*
|
|
Merge branch 'feature/otr_verification' into development
iNPUTmice
2014-11-15
10
-182
/
+655
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
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
5
-113
/
+158
|
|
*
|
initial smp support
iNPUTmice
2014-11-10
10
-122
/
+552
|
*
|
|
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
5
-113
/
+158
|
*
|
|
initial smp support
iNPUTmice
2014-11-11
10
-122
/
+552
*
|
|
|
Merge pull request #665 from SamWhited/issue71
Daniel Gultsch
2014-11-15
8
-381
/
+729
|
\
\
\
\
|
*
|
|
|
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
*
|
|
|
|
Merge pull request #666 from SamWhited/localefixes
Daniel Gultsch
2014-11-15
2
-3
/
+3
|
\
\
\
\
\
|
*
|
|
|
|
Spelling fixes in Italian translation
Sam Whited
2014-11-14
1
-2
/
+2
|
*
|
|
|
|
Spelling fix in German translation
Sam Whited
2014-11-14
1
-1
/
+1
|
|
/
/
/
/
*
/
/
/
/
Make licenses info untranslatable
Sam Whited
2014-11-14
1
-1
/
+1
|
/
/
/
/
*
|
|
|
Added check for empty from on group chat packet
Kevin Rauwolf
2014-11-14
1
-0
/
+3
*
|
|
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-11-14
1
-5
/
+10
|
\
\
\
\
|
*
\
\
\
Merge pull request #653 from kriztan/patch-2
Daniel Gultsch
2014-11-14
1
-5
/
+10
|
|
\
\
\
\
|
|
*
|
|
|
Update German language
kriztan
2014-11-12
1
-24
/
+0
|
|
*
|
|
|
Update German language
kriztan
2014-11-12
1
-5
/
+34
|
|
|
/
/
/
*
|
/
/
/
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
*
|
formating
iNPUTmice
2014-11-09
2
-24
/
+9
*
|
Merge pull request #645 from betheg/about_all_libs
Daniel Gultsch
2014-11-09
1
-15
/
+24
|
\
\
|
*
|
add libidn to pref_about_message.
Michael
2014-11-09
1
-0
/
+1
|
*
|
add all used libs to the pref_about_message.
Michael
2014-11-09
1
-15
/
+23
*
|
|
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
|
\
\
\
|
*
\
\
Merge pull request #642 from SamWhited/accountgetjid
Daniel Gultsch
2014-11-09
27
-106
/
+102
|
|
\
\
\
|
|
*
|
|
Rework `Account.getJid()' to return full JIDs
Sam Whited
2014-11-09
27
-106
/
+102
*
|
|
|
|
Merge branch 'master' into development
iNPUTmice
2014-11-09
1
-14
/
+22
|
\
\
\
\
\
|
|
/
/
/
/
|
/
|
|
|
/
|
|
|
_
|
/
|
|
/
|
|
|
*
|
|
make avatar service not break on empty names
iNPUTmice
2014-11-09
1
-14
/
+22
*
|
|
|
fixed null pointer in message merger
iNPUTmice
2014-11-09
1
-0
/
+1
|
|
/
/
|
/
|
|
*
|
|
refactored code to always contain full jid for counterpart
iNPUTmice
2014-11-09
8
-86
/
+84
*
|
|
fixed full jid for account
iNPUTmice
2014-11-09
1
-80
/
+76
*
|
|
return null if from ist not set in abstract stanza
iNPUTmice
2014-11-09
1
-12
/
+17
[prev]
[next]
