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
...
|
*
update ui when new avatar was found
iNPUTmice
2014-10-21
2
-0
/
+8
|
*
proper avatar caching
iNPUTmice
2014-10-21
15
-164
/
+223
|
*
refactored avatar generation. first step
iNPUTmice
2014-10-20
25
-368
/
+405
|
*
keep reference to previous and next message in message
iNPUTmice
2014-10-20
3
-13
/
+28
|
*
Merge pull request #569 from kriztan/patch-1
Daniel Gultsch
2014-10-20
1
-0
/
+1
|
|
\
|
|
*
Set default preference ...
kriztan
2014-10-19
1
-1
/
+2
|
*
|
Merge pull request #570 from SamWhited/typo-fixes
Daniel Gultsch
2014-10-20
2
-140
/
+187
|
|
\
\
|
|
*
|
Went a bit wild on the README...
Sam Whited
2014-10-19
1
-137
/
+184
|
|
*
|
A few typo fixes in the README
Sam Whited
2014-10-19
1
-10
/
+10
|
|
*
|
Fixed some strange wording in a string
Sam Whited
2014-10-19
1
-1
/
+1
|
|
/
/
|
*
|
Merge pull request #554 from SamWhited/tls
Daniel Gultsch
2014-10-20
3
-10
/
+48
|
|
\
\
|
|
*
|
Make legacy SSL option default to false
Sam Whited
2014-10-19
2
-2
/
+2
|
|
*
|
Add "Enable legacy SSL" preference
Sam Whited
2014-10-19
3
-14
/
+43
|
|
*
|
Remove support for legacy SSL
Sam Whited
2014-10-18
1
-1
/
+9
|
|
*
|
Enable all supported protocols including TLSv1.1 and 1.2
Sam Whited
2014-10-16
1
-0
/
+1
|
*
|
|
mtm support for image downloader
iNPUTmice
2014-10-19
7
-16
/
+59
|
*
|
|
use new 'api' to add messages to a conversation
iNPUTmice
2014-10-19
1
-3
/
+3
|
*
|
|
force tls for registrations as well
iNPUTmice
2014-10-19
1
-2
/
+5
|
*
|
|
got rid of copyonwrite array list for messages
iNPUTmice
2014-10-19
4
-20
/
+26
|
*
|
|
force tls
iNPUTmice
2014-10-19
1
-3
/
+5
|
*
|
|
Merge branch 'lactide-srv_fix' into development
iNPUTmice
2014-10-19
1
-4
/
+17
|
|
\
\
\
|
|
*
|
|
Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lacti...
iNPUTmice
2014-10-19
1
-4
/
+17
|
|
/
|
|
|
|
|
*
|
|
try all srv responses if necessary
Frank Zschockelt
2014-10-16
1
-4
/
+17
|
*
|
|
|
fixed typo in french translation
iNPUTmice
2014-10-19
1
-1
/
+1
|
*
|
|
|
Merge pull request #555 from SamWhited/build-fixes
Daniel Gultsch
2014-10-19
1
-0
/
+2
|
|
\
\
\
\
|
|
*
|
|
|
Fix problem when merging manifests
Sam Whited
2014-10-16
1
-0
/
+2
|
|
|
|
/
/
|
|
|
/
|
|
|
*
|
|
|
Merge pull request #566 from BenoitBouvarel/patch-1
Daniel Gultsch
2014-10-19
1
-2
/
+63
|
|
\
\
\
\
|
|
*
|
|
|
Update strings.xml
Benoit Bouvarel
2014-10-18
1
-2
/
+63
|
|
|
|
_
|
/
|
|
|
/
|
|
|
*
|
|
|
Merge pull request #565 from the-solipsist/patch-2
Daniel Gultsch
2014-10-19
1
-7
/
+7
|
|
\
\
\
\
|
|
|
/
/
/
|
|
/
|
|
|
|
|
*
|
|
Update README.md
the-solipsist
2014-10-18
1
-5
/
+5
|
|
*
|
|
Update README.md
the-solipsist
2014-10-17
1
-2
/
+2
|
|
/
/
/
|
*
|
|
do not attempt to download images when not connected
iNPUTmice
2014-10-17
8
-45
/
+60
|
*
|
|
made grace period on a per account basis
iNPUTmice
2014-10-17
6
-37
/
+30
|
|
|
/
|
|
/
|
|
*
|
additonal safty net for disabling notifications
iNPUTmice
2014-10-16
1
-0
/
+1
|
*
|
simplified determination whether otr needs starting in a session
iNPUTmice
2014-10-16
1
-7
/
+2
|
*
|
log ending otr sessions on disconnect
iNPUTmice
2014-10-16
2
-3
/
+10
|
*
|
forground/background logging without csi
iNPUTmice
2014-10-16
1
-4
/
+2
|
*
|
make image download message to type=image only after completion
iNPUTmice
2014-10-16
1
-3
/
+2
|
|
/
|
*
added file observer to get notified when files are deleted: fixes #396
iNPUTmice
2014-10-16
2
-3
/
+32
|
*
detect deleted files on start up. got rid of lagecy image provider for perfor...
iNPUTmice
2014-10-15
12
-197
/
+67
|
*
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-10-15
1
-2
/
+12
|
|
\
|
|
*
Merge pull request #551 from emdete/p4
Daniel Gultsch
2014-10-15
1
-2
/
+12
|
|
|
\
|
|
|
*
beautify render script to be easier to diff/patch
M. Dietrich
2014-10-15
1
-2
/
+12
|
*
|
|
refactored file download status. make image http download available for carbo...
iNPUTmice
2014-10-15
24
-210
/
+273
|
|
/
/
|
*
|
Merge pull request #547 from emdete/p0
Daniel Gultsch
2014-10-15
1
-4
/
+4
|
|
\
\
|
|
*
|
remove warning about <> cast
M. Dietrich
2014-10-15
1
-4
/
+4
|
|
|
/
|
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-10-15
1
-2
/
+2
|
|
\
|
|
|
*
Merge pull request #506 from SamWhited/string_fixes
Daniel Gultsch
2014-10-15
1
-2
/
+2
|
|
|
\
|
|
|
*
Remove full stop in description for consistency
Sam Whited
2014-09-29
1
-1
/
+1
|
|
|
*
Fix typos in string resource
Sam Whited
2014-09-29
1
-2
/
+2
[prev]
[next]