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
*
disable sm logging
Daniel Gultsch
2015-12-10
1
-5
/
+1
*
always show conversations with pending subscription requests
Daniel Gultsch
2015-12-09
1
-3
/
+5
*
wait with status change to online after all disco queries have been made
Daniel Gultsch
2015-12-09
1
-5
/
+14
*
when no avatar found show avatar of contact and not the muc user in conferences
Daniel Gultsch
2015-12-09
3
-5
/
+13
*
show sender name for notications in conferences. fixes #1581
Daniel Gultsch
2015-12-09
1
-0
/
+17
*
also verify sessions in CBE mode that got created by key transport messages
Daniel Gultsch
2015-12-08
1
-2
/
+14
*
modified contact permission dialog
Daniel Gultsch
2015-12-07
1
-1
/
+1
*
ask for contact permissions when first opening StartConversationActivity
Daniel Gultsch
2015-12-07
4
-16
/
+80
*
request storage permission when needed on Android 6.0
Daniel Gultsch
2015-12-07
5
-16
/
+70
*
implement direct sharing in android 6.0. fixes #1321
Daniel Gultsch
2015-12-07
2
-23
/
+151
*
hide prepare file toast after preparing the file
Daniel Gultsch
2015-12-06
1
-0
/
+1
*
check availabiltiy of pgp before sharing files
Daniel Gultsch
2015-12-05
1
-0
/
+4
*
be more carefull with pending uris
Daniel Gultsch
2015-12-05
1
-8
/
+16
*
check for query object as condition to trigger deduplication instead of serverId
Daniel Gultsch
2015-12-05
1
-1
/
+1
*
parse stanza-id from messages
Daniel Gultsch
2015-12-04
2
-3
/
+23
*
properly clear muc user avatar caches
Daniel Gultsch
2015-12-04
4
-13
/
+30
*
fixed showing avatars for contacts in muc
Daniel Gultsch
2015-12-04
1
-1
/
+10
*
Merge pull request #1595 from fiaxh/pgp_database_signature
Daniel Gultsch
2015-12-04
3
-74
/
+96
|
\
|
*
Unset all PGP signatures once
fiaxh
2015-12-02
3
-74
/
+96
*
|
avoid some NPEs
Daniel Gultsch
2015-12-04
2
-3
/
+4
*
|
rely on message id if message id is uuid and pgp encryption was used to dedup...
Daniel Gultsch
2015-12-04
1
-1
/
+3
*
|
use proposed nick as default nick in mucoptions
Daniel Gultsch
2015-12-04
3
-8
/
+1
*
|
parse vcard avatars from muc presences
Daniel Gultsch
2015-12-03
6
-181
/
+295
*
|
enabled previously disabled http upload
Daniel Gultsch
2015-12-03
1
-1
/
+1
*
|
Merge branch 'master' of github.com:siacs/Conversations
Daniel Gultsch
2015-12-02
3
-3
/
+22
|
\
\
|
*
\
Merge pull request #1545 from SamWhited/show_new_contact_request_messages
Daniel Gultsch
2015-12-02
3
-3
/
+22
|
|
\
\
|
|
|
/
|
|
/
|
|
|
*
Show status message when contact requests presence
Sam Whited
2015-12-02
3
-3
/
+22
*
|
|
show tor config in paranoid mode
Daniel Gultsch
2015-12-02
1
-1
/
+1
|
/
/
*
|
fixed avatar loading for non-file uris
Daniel Gultsch
2015-12-02
2
-11
/
+7
*
|
users are now able to crop their avatar pictures using the android-crop
Philip Flohr
2015-12-02
2
-8
/
+35
*
|
hide message content in notifications in paranoia mode
Daniel Gultsch
2015-12-02
1
-20
/
+30
|
/
*
introduced build-time paranoia mode that disables unencrypted chats and force...
Daniel Gultsch
2015-12-01
5
-4
/
+24
*
introduce config.java variable to optionally show number of connected account...
Daniel Gultsch
2015-12-01
2
-37
/
+57
*
fixed crashes when activity got destroyed when selecting pgp key
Daniel Gultsch
2015-12-01
2
-40
/
+95
*
combine multiple message receipts into single message
Daniel Gultsch
2015-12-01
2
-12
/
+15
*
add error state for unavailable tor network
Daniel Gultsch
2015-12-01
3
-13
/
+14
*
always use http proxy for http requests. (socks is leaking dns)
Daniel Gultsch
2015-12-01
1
-5
/
+1
*
refactored socks5 connection code. make jingle transport use that new code
Daniel Gultsch
2015-12-01
4
-53
/
+72
*
do socks5 connect manually
Daniel Gultsch
2015-12-01
3
-51
/
+69
*
initial tor support
Daniel Gultsch
2015-12-01
11
-129
/
+273
*
changed method signature of calcSampleSize
Daniel Gultsch
2015-11-30
1
-1
/
+1
*
hide subject edit button if not editable by user
Daniel Gultsch
2015-11-26
4
-5
/
+30
*
encrypt pgp messages to self
Daniel Gultsch
2015-11-26
1
-8
/
+8
*
detect server identity and added muc-workaround for slack
Daniel Gultsch
2015-11-26
3
-5
/
+49
*
removed unnecessary configuration fetch after join
Daniel Gultsch
2015-11-26
1
-1
/
+1
*
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
[next]