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
*
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
*
|
|
synchronization for listeners
iNPUTmice
2014-10-15
1
-43
/
+60
*
|
|
synchronization for notification
iNPUTmice
2014-10-15
1
-11
/
+17
*
|
|
removed unecessary update
iNPUTmice
2014-10-15
1
-1
/
+0
|
/
/
*
|
changed pgp decoding mechanism
iNPUTmice
2014-10-15
3
-36
/
+47
*
|
don't show invalid file size
iNPUTmice
2014-10-14
1
-1
/
+4
*
|
recreate http connection after restart. fixes stale download button. better f...
iNPUTmice
2014-10-14
4
-26
/
+95
*
|
catch can't open database exception
iNPUTmice
2014-10-14
1
-4
/
+9
*
|
read image bounds on downloaded image
iNPUTmice
2014-10-14
6
-31
/
+104
*
|
possible work around for notification bug
iNPUTmice
2014-10-14
1
-0
/
+17
*
|
fixed rare npe
iNPUTmice
2014-10-14
1
-2
/
+6
*
|
renaming
iNPUTmice
2014-10-14
15
-43
/
+39
*
|
basic image over http downloading
iNPUTmice
2014-10-14
20
-213
/
+429
*
|
Merge pull request #543 from emdete/dedepricate
Daniel Gultsch
2014-10-13
1
-1
/
+1
|
\
\
|
*
|
use setAlpha(float) method, not the depricated one
M. Dietrich
2014-10-13
1
-1
/
+1
*
|
|
changed card boarder a bit
iNPUTmice
2014-10-13
1
-4
/
+17
*
|
|
reworked muc details and contact details a bit
iNPUTmice
2014-10-13
14
-323
/
+190
*
|
|
added missing border
iNPUTmice
2014-10-13
1
-0
/
+6
[next]