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
*
proper desc for offering and sending images in conversations overview
iNPUTmice
2015-01-18
2
-0
/
+10
*
explain read marker
iNPUTmice
2015-01-18
2
-20
/
+19
*
use same helper methods for images and files
iNPUTmice
2015-01-18
3
-61
/
+19
*
Merge pull request #899 from SamWhited/api21_notifications
Daniel Gultsch
2015-01-18
1
-0
/
+4
|
\
|
*
Add some Android 21 notification features
Sam Whited
2015-01-17
1
-0
/
+4
*
|
Merge pull request #901 from kriztan/patch-2
Daniel Gultsch
2015-01-18
2
-0
/
+6
|
\
\
|
*
|
Added new file type names for file transfers
Christian S
2015-01-18
2
-0
/
+6
|
|
/
*
|
Merge pull request #898 from SamWhited/unknown_filetype_string_fix
Daniel Gultsch
2015-01-18
2
-2
/
+3
|
\
\
|
|
/
|
/
|
|
*
Fix string substitutions with unknown filetypes
Sam Whited
2015-01-17
2
-2
/
+3
|
/
*
Merge pull request #897 from SamWhited/download_file_fixes
Daniel Gultsch
2015-01-17
8
-24
/
+18
|
\
|
*
Correct the download file string on notifications
Sam Whited
2015-01-17
8
-24
/
+18
|
/
*
Merge branch 'SamWhited-download-button-notification' into development
iNPUTmice
2015-01-16
8
-29
/
+71
|
\
|
*
Add download button on notification if applicable
Sam Whited
2015-01-16
8
-29
/
+71
|
/
*
sending read marker when resuming activity and conversation is open
iNPUTmice
2015-01-15
1
-1
/
+4
*
show toast when avatar has been published - fixed #874
iNPUTmice
2015-01-15
2
-13
/
+14
*
added dedicated button to disable foreground service in perma notification
iNPUTmice
2015-01-15
6
-3
/
+11
*
fixed #888
iNPUTmice
2015-01-15
1
-1
/
+1
*
Merge pull request #886 from rtreffer/development
Daniel Gultsch
2015-01-14
24
-2949
/
+1
|
\
|
*
Switch to maven central minidns
Rene Treffer
2015-01-14
24
-2949
/
+1
*
|
Merge pull request #885 from SamWhited/display-enter-key
Daniel Gultsch
2015-01-14
5
-26
/
+52
|
\
\
|
*
|
Add option to swap enter/emoticon key
Sam Whited
2015-01-14
5
-26
/
+52
*
|
|
handle muc nicks with white spaces. fixed #884
iNPUTmice
2015-01-14
2
-3
/
+4
|
|
/
|
/
|
*
|
Merge pull request #883 from SamWhited/ciphers
Daniel Gultsch
2015-01-14
5
-43
/
+94
|
\
\
|
|
/
|
/
|
|
*
Harden the TLS connection cipher suites
Sam Whited
2015-01-14
5
-43
/
+94
|
/
*
Merge pull request #882 from SamWhited/apiandjavafixes
Daniel Gultsch
2015-01-14
1
-15
/
+30
|
\
|
*
Ensure type safety in Pebble notifications
Sam Whited
2015-01-13
1
-15
/
+30
*
|
Merge pull request #881 from SamWhited/about-padding-fix
Daniel Gultsch
2015-01-14
1
-1
/
+1
|
\
\
|
|
/
|
/
|
|
*
Fix bottom padding on about page
Sam Whited
2015-01-13
1
-1
/
+1
|
/
*
added faq about beta testing
Daniel Gultsch
2015-01-13
1
-0
/
+10
*
make use of different dimensions for different screen sizes
Daniel Gultsch
2015-01-13
15
-114
/
+56
*
Merge pull request #872 from Elinvention/development
Daniel Gultsch
2015-01-13
1
-25
/
+104
|
\
|
*
Updated Italian translations
Elia
2015-01-13
1
-25
/
+104
*
|
Merge pull request #873 from SamWhited/about-margin-fix
Daniel Gultsch
2015-01-13
1
-4
/
+4
|
\
\
|
|
/
|
/
|
|
*
Use margin instead of padding in about screen
Sam Whited
2015-01-12
1
-4
/
+4
*
|
Merge pull request #870 from svetlemodry/development
Daniel Gultsch
2015-01-12
1
-9
/
+37
|
\
\
|
|
/
|
/
|
|
*
Czech translation
Jaroslav Lichtblau
2015-01-12
1
-9
/
+37
|
/
*
Merge pull request #868 from SamWhited/ignore-extra-translations
Daniel Gultsch
2015-01-12
1
-1
/
+1
|
\
|
*
Don't fail on extra translations
Sam Whited
2015-01-12
1
-1
/
+1
*
|
catch bug in guessContentType
Daniel Gultsch
2015-01-12
1
-1
/
+6
|
/
*
context menu for files and offered files. fixed #848 fixed #849
Daniel Gultsch
2015-01-12
3
-17
/
+24
*
reworked message preview / message meta information (ie file offered, receive...
Daniel Gultsch
2015-01-12
5
-168
/
+171
*
Merge pull request #866 from SamWhited/xep0245
Daniel Gultsch
2015-01-12
5
-159
/
+206
|
\
|
*
Add XEP-0245 (/me command) support
Sam Whited
2015-01-11
5
-159
/
+206
*
|
do not check image file size over http if accepted file size is 0
Daniel Gultsch
2015-01-11
2
-6
/
+11
*
|
keep proper image file extension
Daniel Gultsch
2015-01-11
4
-26
/
+39
|
/
*
updated travis file to build with android-m2repository
Daniel Gultsch
2015-01-11
1
-0
/
+1
*
shortened some string
Daniel Gultsch
2015-01-11
2
-2
/
+3
*
fixed #860
Daniel Gultsch
2015-01-10
1
-0
/
+1
*
use latest support library
Daniel Gultsch
2015-01-10
1
-1
/
+1
*
make room persistant when changing subject or other muc options
Daniel Gultsch
2015-01-10
3
-16
/
+26
[next]