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
/
conversations
/
xmpp
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-06
1
-1
/
+2
|
\
*
\
Merge tag '1.11.3' into trz/rebase
lookshe
2016-04-05
3
-13
/
+43
|
\
\
|
*
|
check max http file size when attaching files
Daniel Gultsch
2016-04-01
1
-2
/
+15
|
*
|
add methods to check max file size for http upload
Daniel Gultsch
2016-03-31
1
-8
/
+21
|
*
|
save otr fingerprint in message
Daniel Gultsch
2016-03-31
1
-1
/
+1
|
*
|
include form fields into caps hash calculation
Daniel Gultsch
2016-03-31
1
-4
/
+8
*
|
|
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
lookshe
2016-03-25
2
-6
/
+8
|
\
|
|
|
*
|
allow to delete attachments. fixes #1539
Daniel Gultsch
2016-03-23
1
-4
/
+1
|
*
|
only add image files to media scanner
Daniel Gultsch
2016-03-23
1
-3
/
+1
|
*
|
be more careful to avoid creating multiple connections
Daniel Gultsch
2016-03-20
1
-3
/
+7
*
|
|
Merge tag '1.11.1' into trz/merge_1.11.1
lookshe
2016-03-17
1
-2
/
+2
|
\
|
|
|
*
|
log reason for bind failure
Daniel Gultsch
2016-03-11
1
-2
/
+2
*
|
|
removed duplicated source
lookshe
2016-03-12
1
-21
/
+10
*
|
|
Added method to get body from message if hasMeCommand and harmonized extracti...
lookshe
2016-03-12
1
-20
/
+27
*
|
|
Merge tag '1.11.0' into trz/merge_1.11.0
lookshe
2016-03-08
1
-4
/
+4
|
\
|
|
|
*
|
add a few more know file extensions
Daniel Gultsch
2016-03-04
1
-3
/
+3
|
*
|
refactored omemo to take multiple recipients
Daniel Gultsch
2016-02-29
1
-1
/
+1
*
|
|
Fixes FS#151 - Missing button on image-links
lookshe
2016-03-07
1
-1
/
+2
*
|
|
Fixes FS#146: Remove Tor-Support
steckbrief
2016-03-02
2
-22
/
+5
*
|
|
Fixed merge issue for resolving FS#47 (preferences involved in the decision f...
steckbrief
2016-02-24
1
-1
/
+1
*
|
|
Merge tag '1.10.0' into trz/merge_1.10.0
lookshe
2016-02-22
2
-31
/
+54
|
\
|
|
|
*
|
fixed regression that caused messages in muc not being send
Daniel Gultsch
2016-02-17
1
-1
/
+1
|
*
|
optional mode to close tcp connection when going into background
Daniel Gultsch
2016-02-14
1
-20
/
+38
|
*
|
send push enable to server. simplified logging
Daniel Gultsch
2016-02-13
1
-2
/
+7
|
*
|
client side support for XEP-0357: Push Notifications
Daniel Gultsch
2016-02-12
1
-9
/
+5
*
|
|
Merge tag '1.9.4' into trz/merge_1.9.4
trz/merge_1.9.4
lookshe
2016-02-16
2
-50
/
+49
|
\
|
|
|
*
|
use TLSv1.2 as SSL context on supported plattforms
Daniel Gultsch
2016-02-03
1
-1
/
+1
|
*
|
cache server caps
Daniel Gultsch
2016-02-03
2
-2
/
+18
|
*
|
Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...
Daniel Gultsch
2016-02-02
1
-47
/
+30
|
|
\
\
|
|
*
|
Factor out a representation of XEP-0030 results
Stephen Paul Weber
2016-01-23
1
-47
/
+30
*
|
|
|
Imports organized
steckbrief
2016-02-12
6
-39
/
+2
*
|
|
|
Simplification of DNS requests.
steckbrief
2016-02-12
1
-63
/
+48
*
|
|
|
Compilation errors and merge mixups fixed
steckbrief
2016-02-11
1
-0
/
+1
*
|
|
|
Merge tag '1.9.3' into trz/merge_1.9.3
lookshe
2016-02-11
20
-512
/
+1031
|
\
|
|
|
|
*
|
|
be more careful with resetting the stream id
Daniel Gultsch
2016-01-29
1
-2
/
+1
|
*
|
|
show values in formfieldwrappers and allow form to be set to read only
Daniel Gultsch
2016-01-26
1
-3
/
+3
|
*
|
|
expert setting to trigger extended connection options
Daniel Gultsch
2016-01-25
1
-2
/
+11
|
*
|
|
added FormWrapper and form field validation
Daniel Gultsch
2016-01-23
1
-0
/
+15
|
|
/
/
|
*
|
reset stanza queue when resetting xmppconnection
Daniel Gultsch
2016-01-23
1
-0
/
+1
|
*
|
added UI wrapper for (some) form fields
Daniel Gultsch
2016-01-22
2
-1
/
+17
|
*
|
added config variable to allow non-tls connections
Daniel Gultsch
2016-01-22
1
-2
/
+3
|
*
|
reuse same xmppconnection for reconnects
Daniel Gultsch
2016-01-16
1
-0
/
+8
|
*
|
nimbuzz.com: don't wait for disco replies to set account to online
Daniel Gultsch
2016-01-15
1
-11
/
+26
|
*
|
throw security exception instead of going to next srv entry
Daniel Gultsch
2016-01-12
1
-1
/
+3
|
*
|
move some ssl socket modifiers into a seperate helper class
Daniel Gultsch
2016-01-12
1
-56
/
+5
|
*
|
Implement XEP-0368: SRV records for XMPP over TLS
moparisthebest
2016-01-11
1
-54
/
+149
|
*
|
reworked that loop that iterates over various servers
reworked_host_finder_loop
Daniel Gultsch
2016-01-11
1
-16
/
+10
|
*
|
throw exception at the end of the stream
Daniel Gultsch
2015-12-17
1
-128
/
+122
|
*
|
timeout service discovery after 20s
Daniel Gultsch
2015-12-15
1
-7
/
+42
|
*
|
wait with status change to online after all disco queries have been made
Daniel Gultsch
2015-12-09
1
-5
/
+14
[next]