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 tag '1.11.3' into trz/rebase
lookshe
2016-04-05
17
-53
/
+196
|
\
|
*
don't ask for resource when server uses http upload v0.1
Daniel Gultsch
2016-04-02
3
-6
/
+8
|
*
check max http file size when attaching files
Daniel Gultsch
2016-04-01
6
-12
/
+83
|
*
add methods to check max file size for http upload
Daniel Gultsch
2016-03-31
5
-12
/
+41
|
*
save otr fingerprint in message
Daniel Gultsch
2016-03-31
6
-12
/
+15
|
*
include form fields into caps hash calculation
Daniel Gultsch
2016-03-31
2
-6
/
+25
|
*
closed some cursors under error conditions
Daniel Gultsch
2016-03-31
1
-3
/
+13
|
*
made setting aes keys in DownloadableFile more readable
Daniel Gultsch
2016-03-31
1
-12
/
+8
|
*
Update ShortcutBadger to version 1.1.4
Christian S
2016-03-27
1
-2
/
+2
*
|
fixed installation error "W/PackageManager: Can't install because provider na...
trz/beta-1
lookshe
2016-04-03
2
-1
/
+21
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-04-01
1
-1
/
+6
|
\
\
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-30
1
-1
/
+3
|
\
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-30
3
-0
/
+6
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
1
-20
/
+9
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
5
-70
/
+28
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
13
-99
/
+72
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-28
2
-2
/
+8
|
\
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-27
2
-3
/
+24
|
\
|
|
*
|
|
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
lookshe
2016-03-25
13
-38
/
+80
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
allow to delete attachments. fixes #1539
Daniel Gultsch
2016-03-23
6
-30
/
+41
|
*
|
only add image files to media scanner
Daniel Gultsch
2016-03-23
6
-13
/
+26
|
*
|
Typo `attempt`
licaon-kter
2016-03-22
1
-1
/
+1
|
*
|
show room nick for /me command in sent muc messages. fixes #1773
Daniel Gultsch
2016-03-20
1
-4
/
+5
|
*
|
be less strict when sharing EXTRA_TEXT intents
Daniel Gultsch
2016-03-20
1
-1
/
+1
|
*
|
be more careful to avoid creating multiple connections
Daniel Gultsch
2016-03-20
2
-3
/
+8
|
*
|
don't show v\omemo keys as such if not enabled
Daniel Gultsch
2016-03-20
2
-4
/
+5
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-22
2
-26
/
+42
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-21
1
-4
/
+19
|
\
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
1
-1
/
+1
|
\
|
|
*
|
|
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
|
\
|
|
[next]
