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
*
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
1
-18
/
+14
|
\
*
\
Merge branch 'trz/rebase' into trz/merge_1.11.1
trz/merge_1.11.1
lookshe
2016-03-20
5
-37
/
+74
|
\
\
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
5
-37
/
+74
|
|
\
|
*
|
|
fixed merge errors
lookshe
2016-03-20
4
-20
/
+28
*
|
|
Merge tag '1.11.1' into trz/merge_1.11.1
lookshe
2016-03-17
8
-74
/
+115
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
made it possible to share text files
Daniel Gultsch
2016-03-16
1
-7
/
+8
|
*
|
reworked sharewith activity to stay open during sharing
Daniel Gultsch
2016-03-16
2
-30
/
+66
|
*
|
Check if path for URI is accessible
fiaxh
2016-03-15
1
-1
/
+10
|
*
|
simplified getUsers(max) code
Daniel Gultsch
2016-03-13
1
-11
/
+2
|
*
|
added logging in case fragment wasn't attached
Daniel Gultsch
2016-03-13
1
-0
/
+5
|
*
|
fixed recursive call instead of call to super in PublishProfileActivity
Daniel Gultsch
2016-03-13
1
-5
/
+1
|
*
|
log reason for bind failure
Daniel Gultsch
2016-03-11
1
-2
/
+2
|
*
|
close cursor in caps db query
Daniel Gultsch
2016-03-11
1
-1
/
+3
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-15
2
-4
/
+4
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-12
3
-9
/
+13
|
\
|
|
*
|
|
fixed possible NPE
lookshe
2016-03-12
1
-0
/
+6
*
|
|
small bugfixes
lookshe
2016-03-12
2
-1
/
+4
*
|
|
removed duplicated source
lookshe
2016-03-12
4
-36
/
+41
*
|
|
Added method to get body from message if hasMeCommand and harmonized extracti...
lookshe
2016-03-12
6
-44
/
+67
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
3
-77
/
+11
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
6
-147
/
+25
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-10
3
-37
/
+45
|
\
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
trz/1.11.0.1
lookshe
2016-03-08
1
-17
/
+20
|
\
|
|
*
|
|
Fixes FS#153 - Check if url, phone and email are linkified correctly
lookshe
2016-03-08
1
-6
/
+31
*
|
|
Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquare
trz/merge_1.11.0
steckbrief
2016-03-08
1
-1
/
+1
*
|
|
Fixed merge issue with AxolotlService (differentiation between impl and inter...
steckbrief
2016-03-08
3
-133
/
+171
*
|
|
Merge tag '1.11.0' into trz/merge_1.11.0
lookshe
2016-03-08
28
-340
/
+668
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
don't show opt-out of battery optimization dialog when push is enabled
Daniel Gultsch
2016-03-06
3
-4
/
+17
|
*
|
warn in conversations when account is disabled
Daniel Gultsch
2016-03-06
1
-1
/
+14
|
*
|
Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun01...
Daniel Gultsch
2016-03-04
1
-0
/
+10
|
|
\
\
|
|
*
|
Fix Issue #1634 : Shows XMPP URI as links.
Tarun
2016-02-29
1
-0
/
+10
|
*
|
|
show host in file size checker
Daniel Gultsch
2016-03-04
1
-1
/
+14
|
*
|
|
mark oob messages and always display download button
Daniel Gultsch
2016-03-04
4
-6
/
+30
|
*
|
|
don't automatically crop avatar
Daniel Gultsch
2016-03-04
1
-22
/
+40
|
*
|
|
add a few more know file extensions
Daniel Gultsch
2016-03-04
4
-10
/
+13
|
*
|
|
allow to copy original url even while downloading. fixes #1743
Daniel Gultsch
2016-03-04
1
-6
/
+9
|
*
|
|
moved avatarfetcher reset code to bind
Daniel Gultsch
2016-03-03
1
-8
/
+8
|
*
|
|
avoid unnecessary disconnect. prevent NetworkOnMainThreadException
Daniel Gultsch
2016-03-03
1
-3
/
+3
|
*
|
|
don't break with srcoll events on empty message lists
Daniel Gultsch
2016-03-03
1
-2
/
+7
|
*
|
|
expert option to treat vibrate as silent mode for XA. fixes #1530
Daniel Gultsch
2016-03-01
2
-7
/
+18
|
*
|
|
removed unused config variable
Daniel Gultsch
2016-03-01
1
-4
/
+0
|
*
|
|
properly persist accepted crypto targets
Daniel Gultsch
2016-03-01
1
-5
/
+1
|
*
|
|
let users confirm each member in a conference even if that contact is already...
Daniel Gultsch
2016-03-01
4
-26
/
+102
|
*
|
|
use correct jid when leaving a conference. fixes #1732
Daniel Gultsch
2016-02-29
2
-6
/
+6
|
*
|
|
refactored omemo to take multiple recipients
Daniel Gultsch
2016-02-29
10
-147
/
+286
|
*
|
|
rename purge keys positive button to 'purge keys'
Daniel Gultsch
2016-02-28
1
-1
/
+1
|
*
|
|
made hashtable in roster store jids instead of strings
Daniel Gultsch
2016-02-28
1
-9
/
+7
|
*
|
|
always search offline contacts as well. fixes #1653
Daniel Gultsch
2016-02-27
1
-0
/
+1
|
*
|
|
Merge branch 'master' of github.com:siacs/Conversations
Daniel Gultsch
2016-02-27
3
-1
/
+34
|
|
\
\
\
|
|
*
\
\
Merge pull request #1721 from fiaxh/export_logs_storage_permission
Daniel Gultsch
2016-02-27
3
-1
/
+34
|
|
|
\
\
\
[next]