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
...
*
removed unecessary chat state
Daniel Gultsch
2015-11-26
1
-1
/
+1
*
fail jingle file transfer if axolotl key message could not be created. fixes ...
Daniel Gultsch
2015-11-26
1
-1
/
+5
*
pgp fixes and revert configuration changes
Daniel Gultsch
2015-11-25
15
-129
/
+91
*
Merge pull request #1569 from fiaxh/conference_one_other_occupant
Daniel Gultsch
2015-11-24
1
-20
/
+48
|
\
|
*
Own contact picture in tile for conferences with only one other occupant
fiaxh
2015-11-15
1
-20
/
+48
*
|
Merge pull request #1558 from fiaxh/pgp_api_9.0
Daniel Gultsch
2015-11-24
7
-44
/
+137
|
\
\
|
*
|
Sign empty status
fiaxh
2015-11-09
2
-3
/
+1
|
*
|
Use OpenPGP-API 9.0
fiaxh
2015-11-09
6
-43
/
+138
|
|
/
*
/
PgpEngine: Get account from conversation instead of from contact. fixes #1568...
fiaxh
2015-11-15
1
-3
/
+3
|
/
*
Move migration 19 before 17
Andreas Straub
2015-11-06
1
-3
/
+6
*
don't close socket on disconnect
Daniel Gultsch
2015-11-01
1
-1
/
+0
*
indicate cbe in chat message hint
Daniel Gultsch
2015-10-31
2
-1
/
+23
*
explicitly mark verified omemo keys in UI
Daniel Gultsch
2015-10-31
6
-16
/
+46
*
fixed session objects not being build on start up
Daniel Gultsch
2015-10-30
2
-2
/
+1
*
Merge pull request #1513 from fiaxh/pgp_background_decryption
Daniel Gultsch
2015-10-30
10
-74
/
+292
|
\
|
*
Show PGP "please wait" message only when actually decrypting
fiaxh
2015-10-28
1
-1
/
+5
|
*
Decrypt PGP messages in background
fiaxh
2015-10-28
9
-73
/
+287
*
|
moved db calls made from UI into serial background thread
Daniel Gultsch
2015-10-29
1
-5
/
+21
*
|
avoid npe when checking for stream restart
Daniel Gultsch
2015-10-29
1
-2
/
+4
*
|
push CN into nick pep node when uploading certificate. subscribe to nick node
Daniel Gultsch
2015-10-29
7
-5
/
+47
*
|
Merge branch 'master' of github.com:siacs/Conversations
Daniel Gultsch
2015-10-29
1
-1
/
+1
|
\
|
|
*
Don't synchronize on non-final field
Sam Whited
2015-10-26
1
-1
/
+1
*
|
load avatars in message adapter in background task
Daniel Gultsch
2015-10-29
2
-13
/
+111
*
|
show encryption type in warned/red messages
Daniel Gultsch
2015-10-28
2
-0
/
+21
|
/
*
Merge pull request #1520 from saqura/self_handle_orientation
Daniel Gultsch
2015-10-26
5
-1
/
+50
|
\
|
*
Reset the margins manually after rotating
saqura
2015-10-26
5
-1
/
+50
*
|
invalidate menu after backend connection.
Daniel Gultsch
2015-10-25
1
-0
/
+1
|
/
*
join muc even if initial conference configuration fetch failed
Daniel Gultsch
2015-10-22
2
-2
/
+43
*
fixed read conversations showing up as notifications after a restart
Daniel Gultsch
2015-10-21
1
-5
/
+4
*
open unknown files with wildcard intent
Daniel Gultsch
2015-10-20
2
-10
/
+15
*
open manage account + certificate chooser when cbe mode is enabled
Daniel Gultsch
2015-10-20
2
-28
/
+39
*
move chat state reset from background switch to foreground switch to account ...
Daniel Gultsch
2015-10-19
1
-3
/
+3
*
update last seen in mucs. fixes #1508
Daniel Gultsch
2015-10-19
1
-1
/
+5
*
add nick to bookmark when entering full jid in join conference dialog
Daniel Gultsch
2015-10-19
1
-4
/
+6
*
synchronize around the disco object
Daniel Gultsch
2015-10-19
1
-44
/
+53
*
disconnet in background thread
Daniel Gultsch
2015-10-17
1
-1
/
+7
*
only try EXTERNAL auth if client certificate is set for account
Daniel Gultsch
2015-10-17
1
-1
/
+1
*
don't retry building broken omemo keys
Daniel Gultsch
2015-10-17
1
-4
/
+15
*
allow redownloading files from remote hosts. fixes #1504
Daniel Gultsch
2015-10-17
2
-3
/
+13
*
load axolotl session cache on first device update
Daniel Gultsch
2015-10-17
1
-2
/
+6
*
improved error reporting in trust keys activity
Daniel Gultsch
2015-10-17
6
-22
/
+47
*
introduced code to verify omemo device keys with x509 certificates.
Daniel Gultsch
2015-10-16
8
-65
/
+190
*
block code when doing unforced disconnect
Daniel Gultsch
2015-10-16
2
-223
/
+220
*
moved other name parsing into seperate method
Daniel Gultsch
2015-10-15
1
-40
/
+45
*
use constants for oids in xmppdomainverifier
Daniel Gultsch
2015-10-15
1
-2
/
+5
*
more checks for xmppdomainverifier and better wildcard handling
Daniel Gultsch
2015-10-15
1
-4
/
+10
*
use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier. fixe...
Daniel Gultsch
2015-10-15
2
-2
/
+116
*
clear bitmap cache before running out of memory
Daniel Gultsch
2015-10-14
1
-0
/
+9
*
make unread status and notifications presistent across restarts
Daniel Gultsch
2015-10-14
6
-34
/
+74
*
work with muc services that change the message id
Daniel Gultsch
2015-10-14
2
-1
/
+3
[prev]
[next]