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
*
version bump and changelog
0.8
iNPUTmice
2014-10-30
2
-1
/
+8
*
Merge branch 'development'
iNPUTmice
2014-10-30
82
-1950
/
+3092
|
\
|
*
only end otr session if there is more than one contact presence. reset otherwise
iNPUTmice
2014-10-30
1
-1
/
+5
|
*
cleanup for clear conversation history. small otr fixes
iNPUTmice
2014-10-30
4
-26
/
+22
|
*
replace the exif interface with a small static class from 3d gallery
iNPUTmice
2014-10-29
2
-17
/
+167
|
*
proper error state for images
iNPUTmice
2014-10-29
6
-20
/
+17
|
*
fixed 'share image' context menu
iNPUTmice
2014-10-29
1
-2
/
+1
|
*
fixed intent managment
iNPUTmice
2014-10-29
1
-8
/
+8
|
*
Merge pull request #593 from weiss/improve-german-translations
Daniel Gultsch
2014-10-29
1
-7
/
+7
|
|
\
|
|
*
Improve some of the German translations
Holger Weiß
2014-10-28
1
-7
/
+7
|
|
/
|
*
end otr session if plain text message from another instance is being received
iNPUTmice
2014-10-28
1
-1
/
+8
|
*
improvements on findConversation
iNPUTmice
2014-10-28
1
-2
/
+2
|
*
always show verify fingerprint if there is an active otr session
iNPUTmice
2014-10-28
1
-5
/
+4
|
*
reworked dns retry
iNPUTmice
2014-10-27
2
-66
/
+51
|
*
removed unnecessary logging from avatar service
iNPUTmice
2014-10-27
1
-5
/
+0
|
*
proper cleanup after pgp image decryption
iNPUTmice
2014-10-27
1
-16
/
+9
|
*
fixed url parsing
iNPUTmice
2014-10-27
1
-1
/
+6
|
*
check for links in pgp encrypted messages as well
iNPUTmice
2014-10-27
4
-7
/
+12
|
*
Merge pull request #590 from weiss/update-german-translations
Daniel Gultsch
2014-10-27
2
-1
/
+17
|
|
\
|
|
*
Update German translations
Holger Weiß
2014-10-26
2
-1
/
+17
|
|
/
|
*
set divider for image meta information to '|' to not conflict with URL. break...
iNPUTmice
2014-10-26
4
-8
/
+53
|
*
Merge pull request #588 from betheg/remove_unused_cast
Daniel Gultsch
2014-10-26
10
-32
/
+25
|
|
\
|
|
*
remove some unused cast
Michael
2014-10-26
10
-32
/
+25
|
*
|
Merge pull request #587 from betheg/fix_possible_fallthrough
Daniel Gultsch
2014-10-26
2
-0
/
+2
|
|
\
\
|
|
|
/
|
|
/
|
|
|
*
fix possible fallthrough.
Michael
2014-10-26
2
-0
/
+2
|
|
/
|
*
Merge pull request #586 from SamWhited/issue585
Daniel Gultsch
2014-10-26
1
-2
/
+2
|
|
\
|
|
*
Use consistent numbering
Sam Whited
2014-10-26
1
-2
/
+2
|
|
/
|
*
don't merge downloadable messages
iNPUTmice
2014-10-24
1
-1
/
+3
|
*
added message option to download images
iNPUTmice
2014-10-24
3
-3
/
+18
|
*
Merge pull request #582 from kruks23/translation7
Daniel Gultsch
2014-10-24
1
-2
/
+11
|
|
\
|
|
*
Update Spanish Translations
kruks23
2014-10-24
1
-2
/
+11
|
*
|
also show some text in new image notification
iNPUTmice
2014-10-24
1
-73
/
+122
|
|
/
|
*
picture notification and some drive by bug fixes
iNPUTmice
2014-10-24
4
-33
/
+40
|
*
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-10-24
1
-0
/
+7
|
|
\
|
|
*
Merge pull request #581 from kruks23/translation7
Daniel Gultsch
2014-10-23
1
-0
/
+7
|
|
|
\
|
|
|
*
Update Spanish Translations
kruks23
2014-10-23
1
-0
/
+7
|
*
|
|
notify only after image has been received over http. introduced mini grace fo...
iNPUTmice
2014-10-24
6
-33
/
+64
|
|
/
/
|
*
/
context menu for messages. allow to resend single messages
iNPUTmice
2014-10-23
11
-39
/
+189
|
|
/
|
*
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-10-22
1
-2
/
+18
|
|
\
|
|
*
Merge pull request #577 from beriain/development
Daniel Gultsch
2014-10-22
1
-2
/
+18
|
|
|
\
|
|
|
*
Update strings.xml
Aitor Beriain
2014-10-22
1
-2
/
+18
|
*
|
|
ability to download pgp encrypted files over http as well
iNPUTmice
2014-10-22
2
-5
/
+9
|
|
/
/
|
*
/
small bug fixes for the conversation activity
iNPUTmice
2014-10-22
1
-2
/
+9
|
|
/
|
*
made httpconnection accept aes encrypted files
iNPUTmice
2014-10-22
5
-16
/
+33
|
*
better aproach on thread saftey
iNPUTmice
2014-10-22
1
-13
/
+7
|
*
changed version to 0.8 alpha
iNPUTmice
2014-10-22
1
-3
/
+3
|
*
added hostname verifier to httpconnection
iNPUTmice
2014-10-22
2
-11
/
+32
|
*
made iterating over hashmap in notification service thread safe
iNPUTmice
2014-10-21
1
-1
/
+8
|
*
throw exception when no servers are left to try
iNPUTmice
2014-10-21
1
-0
/
+6
|
*
fixed #564
iNPUTmice
2014-10-21
3
-6
/
+6
[next]