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
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge branch 'feature-remove-spans' of https://github.com/Mishiranu/Conversat...
Daniel Gultsch
2016-10-20
5
-7
/
+118
|
\
|
*
Remove spans on copying or pasting a text
Mishiranu
2016-10-19
5
-7
/
+118
*
|
introduced low ping timeout mode after gcm push
Daniel Gultsch
2016-10-20
2
-2
/
+13
*
|
write prepped string to db. use display version everywhere else
Daniel Gultsch
2016-10-20
6
-32
/
+45
*
|
include pgp signature only in non anonymous mucs
Daniel Gultsch
2016-10-19
2
-3
/
+7
*
|
retrigger key selection if openpgp key was deleted
Daniel Gultsch
2016-10-19
2
-3
/
+15
|
/
*
update conversation in database background thread
Daniel Gultsch
2016-10-18
5
-18
/
+18
*
don't trigger context menu in message adapter manually. fixes #2077
Daniel Gultsch
2016-10-18
3
-13
/
+6
*
Merge branch 'feature-selection' of https://github.com/Mishiranu/Conversation...
Daniel Gultsch
2016-10-17
6
-0
/
+252
|
\
|
*
Retain TextView selection after list updating
Mishiranu
2016-09-18
3
-39
/
+216
|
*
Add "Select text" context menu option
Mishiranu
2016-09-17
5
-0
/
+75
*
|
add exception handling when loading default resource
Daniel Gultsch
2016-10-17
1
-2
/
+10
*
|
small code reformation in pgp decryption service
Daniel Gultsch
2016-10-17
1
-2
/
+4
*
|
Merge pull request #2063 from thacoon/patch-1
Daniel Gultsch
2016-10-13
1
-1
/
+1
|
\
\
|
*
|
Fix OpenPGP link
Constantin Soffner
2016-10-08
1
-1
/
+1
*
|
|
clarified fineprint a little bit
Daniel Gultsch
2016-10-13
6
-8
/
+10
*
|
|
synchronize access to json key storage in account model
Daniel Gultsch
2016-10-13
3
-73
/
+75
*
|
|
version bump to 1.14.6 + changelog
1.14.6
Daniel Gultsch
2016-10-10
2
-2
/
+7
*
|
|
don't use sending state on muc pms without smacks
Daniel Gultsch
2016-10-09
1
-2
/
+4
*
|
|
add password to direct muc invite
Daniel Gultsch
2016-10-09
1
-0
/
+4
*
|
|
pulled more translations from transifex
Daniel Gultsch
2016-10-09
2
-0
/
+7
*
|
|
pulled translations from transifex
Daniel Gultsch
2016-10-09
29
-170
/
+301
*
|
|
added disclaimer that conversations.im account is 8 euro / year
Daniel Gultsch
2016-10-08
6
-4
/
+40
*
|
|
fetch new conference configuration on every conf update
Daniel Gultsch
2016-10-08
2
-20
/
+20
|
/
/
*
|
reset sending to waiting on every error
Daniel Gultsch
2016-10-07
2
-2
/
+11
*
|
fixed account hash calculation
Daniel Gultsch
2016-10-07
1
-1
/
+1
*
|
respond to chat marker request only when mutual presence subscription exists
Daniel Gultsch
2016-10-07
5
-6
/
+13
*
|
create new instances of key manager every time it's used
Daniel Gultsch
2016-10-07
1
-3
/
+6
*
|
warn user if account is offline during avatar publication
Daniel Gultsch
2016-10-06
2
-4
/
+11
*
|
refresh error notification after 'try again'
Daniel Gultsch
2016-10-06
1
-0
/
+1
*
|
be more careful parsing integers in omemo
Daniel Gultsch
2016-10-06
2
-4
/
+12
*
|
Merge branch 'master' of github.com:siacs/Conversations
Daniel Gultsch
2016-10-06
1
-0
/
+8
|
\
\
|
*
|
Add client recommandition to readme. fixes #2048
Daniel Gultsch
2016-10-05
1
-0
/
+8
*
|
|
issue ping after push was received
Daniel Gultsch
2016-10-06
2
-1
/
+13
*
|
|
parse smacks delay from messages
Daniel Gultsch
2016-10-06
1
-1
/
+1
*
|
|
try to fix messages stuck at sending
Daniel Gultsch
2016-10-06
2
-1
/
+3
|
/
/
*
|
make error notification dismissable. fixes #1815
Daniel Gultsch
2016-10-04
3
-40
/
+47
*
|
fixed omemo shown as unavailable in 1:1 chats
Daniel Gultsch
2016-10-03
5
-5
/
+12
*
|
resolve take photo uri for internal use
Daniel Gultsch
2016-10-03
2
-5
/
+5
*
|
properly index take photo uris from file provider
Daniel Gultsch
2016-10-03
2
-8
/
+15
*
|
add more logging to attaching file process
Daniel Gultsch
2016-10-03
1
-0
/
+14
*
|
when activating omemo in conference always check preferences
Daniel Gultsch
2016-10-03
1
-14
/
+14
*
|
explicit logging when copying files to storage
Daniel Gultsch
2016-10-03
2
-6
/
+3
*
|
version bump to 1.14.5 + changelog
1.14.5
Daniel Gultsch
2016-10-01
2
-2
/
+6
*
|
added nick to conference jid example
Daniel Gultsch
2016-09-28
1
-1
/
+1
*
|
Merge pull request #2027 from danielegobbetti/wear-reply-dismiss-notification
Daniel Gultsch
2016-09-28
2
-10
/
+20
|
\
\
|
*
|
Allow to dismiss the notification from a wear reply.
Daniele Gobbetti
2016-09-27
2
-10
/
+20
*
|
|
simplified code that invokes the export logs service
Daniel Gultsch
2016-09-28
3
-39
/
+9
*
|
|
expert 'setting' to remove omemo identity. fixes #2038
Daniel Gultsch
2016-09-28
4
-4
/
+68
|
/
/
*
|
remove dubplicate play service dependency from build
Daniel Gultsch
2016-09-27
1
-1
/
+0
[next]