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
/
res
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Add security error status
Sam Whited
2014-11-15
1
-0
/
+1
*
Merge branch 'feature/file_transfer' into development
iNPUTmice
2014-11-15
3
-3
/
+17
|
\
|
*
handled more error cases
iNPUTmice
2014-11-15
1
-0
/
+1
|
*
fixed description in notifications and conversation overview
iNPUTmice
2014-11-15
1
-0
/
+2
|
*
made file transfers cancelable
iNPUTmice
2014-11-15
2
-1
/
+5
|
*
adepted conversationadapter to deal with files
iNPUTmice
2014-11-15
1
-0
/
+2
|
*
some mime and pgp fixes for file transfer
iNPUTmice
2014-11-15
1
-0
/
+1
|
*
progress for http images as well. fixed open button for sent files
iNPUTmice
2014-11-15
1
-1
/
+2
|
*
basic arbitrary file transfer
iNPUTmice
2014-11-15
2
-3
/
+6
*
|
Merge branch 'feature/foreground_service' into development
iNPUTmice
2014-11-15
6
-0
/
+9
|
\
\
|
*
|
turn on foreground service in expert settings
iNPUTmice
2014-11-15
6
-0
/
+9
|
|
/
*
|
Merge branch 'feature/otr_verification' into development
iNPUTmice
2014-11-15
3
-60
/
+206
|
\
\
|
|
/
|
/
|
|
*
added snackbar to indicate smp. more error handling in verify activity
iNPUTmice
2014-11-11
2
-0
/
+14
|
*
initial smp support
iNPUTmice
2014-11-11
3
-60
/
+192
*
|
Merge pull request #666 from SamWhited/localefixes
Daniel Gultsch
2014-11-15
2
-3
/
+3
|
\
\
|
*
|
Spelling fixes in Italian translation
Sam Whited
2014-11-14
1
-2
/
+2
|
*
|
Spelling fix in German translation
Sam Whited
2014-11-14
1
-1
/
+1
*
|
|
Make licenses info untranslatable
Sam Whited
2014-11-14
1
-1
/
+1
|
/
/
*
|
Update German language
kriztan
2014-11-12
1
-24
/
+0
*
|
Update German language
kriztan
2014-11-12
1
-5
/
+34
|
/
*
formating
iNPUTmice
2014-11-09
2
-24
/
+9
*
Merge pull request #645 from betheg/about_all_libs
Daniel Gultsch
2014-11-09
1
-15
/
+24
|
\
|
*
add libidn to pref_about_message.
Michael
2014-11-09
1
-0
/
+1
|
*
add all used libs to the pref_about_message.
Michael
2014-11-09
1
-15
/
+23
*
|
Update Spanish Translations
kruks23
2014-11-09
1
-1
/
+21
|
/
*
reformated license a bit
iNPUTmice
2014-11-04
2
-22
/
+16
*
Shorten license text and fix height of scrollview
Sam Whited
2014-11-04
2
-20
/
+7
*
Use normal text size and color
Sam Whited
2014-11-04
1
-1
/
+4
*
Make links clickable in about text
Sam Whited
2014-11-04
2
-4
/
+7
*
Convert about dialog to activity
Sam Whited
2014-11-04
5
-18
/
+40
*
Use real copyright symbol ©
Sam Whited
2014-11-04
1
-3
/
+3
*
Add about dialog with license info
Sam Whited
2014-11-04
2
-0
/
+44
*
show avatar in editaccount
iNPUTmice
2014-11-04
2
-4
/
+15
*
made qr code available from muc and contact details as well
iNPUTmice
2014-11-04
2
-0
/
+8
*
unfinishd qr code implemenation. thanks to @emdete
iNPUTmice
2014-11-03
3
-7
/
+20
*
Wrap "last seen" time.
Sam Whited
2014-11-03
1
-2
/
+1
*
Merge branch 'gradle' into development
Sam Whited
2014-10-30
13
-23
/
+90
*
Make conversations the root project
Sam Whited
2014-10-22
210
-0
/
+6157