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
...
*
support for XEP-0092: Software Version
iNPUTmice
2015-02-16
5
-20
/
+51
*
fixed avatar cache lookup in ListItemAdapter
iNPUTmice
2015-02-16
1
-4
/
+1
*
Merge pull request #986 from singpolyma/vitelity-s.ms-compatability
Daniel Gultsch
2015-02-15
1
-1
/
+1
|
\
|
*
Vitelity's s.ms service requires <body> first
Stephen Paul Weber
2015-02-15
1
-1
/
+1
*
|
made image view background more colorful while waiting on actual avatar to load
iNPUTmice
2015-02-15
2
-2
/
+3
|
/
*
loading avatars in seperate tasks
iNPUTmice
2015-02-15
3
-18
/
+203
*
updated bcprov to 1.51
1.0.3
iNPUTmice
2015-02-13
1
-1
/
+1
*
version bump to 1.0.3
iNPUTmice
2015-02-12
1
-2
/
+2
*
load messages asynchronously
iNPUTmice
2015-02-12
2
-2
/
+24
*
use time instead of uptime for unmute
iNPUTmice
2015-02-12
2
-5
/
+2
*
added actions to error notification
iNPUTmice
2015-02-10
14
-1
/
+53
*
strip fractional seconds from timestamp before parsing
iNPUTmice
2015-02-10
2
-6
/
+4
*
version bump to 1.0.2
iNPUTmice
2015-02-09
1
-2
/
+2
*
disabled cipher logging
iNPUTmice
2015-02-09
1
-1
/
+1
*
Merge pull request #959 from SamWhited/ciphers_fix
Daniel Gultsch
2015-02-09
4
-9
/
+12
|
\
|
*
Use platform ciphers as well, just prefer ours
Sam Whited
2015-02-02
4
-9
/
+12
*
|
don't show 'enter pgp key' in non encrypted chats
iNPUTmice
2015-02-09
1
-0
/
+1
*
|
always add a non resolved SRV record to the list
iNPUTmice
2015-02-09
1
-6
/
+1
*
|
made delay timestamp parser accept nano seconds
iNPUTmice
2015-02-09
1
-1
/
+1
*
|
sort users in muc
Daniel Gultsch
2015-02-07
1
-3
/
+12
*
|
trim message bodys on display
Daniel Gultsch
2015-02-07
2
-3
/
+3
*
|
refactored how snackbar is displayed
Daniel Gultsch
2015-02-07
1
-82
/
+105
|
/
*
version bump
1.0.1
iNPUTmice
2015-02-02
1
-2
/
+2
*
don't disable any ciphers
iNPUTmice
2015-02-02
1
-3
/
+4
*
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2015-02-02
5
-0
/
+0
|
\
|
*
Merge pull request #956 from SamWhited/unused_resources
Daniel Gultsch
2015-02-02
5
-0
/
+0
|
|
\
|
|
*
Remove another unused resource
Sam Whited
2015-02-01
5
-0
/
+0
*
|
|
added more ciphers for old openssl versions
iNPUTmice
2015-02-02
1
-1
/
+3
|
/
/
*
/
bumped version code again
1.0
iNPUTmice
2015-02-01
1
-1
/
+1
|
/
*
Merge pull request #955 from SamWhited/unused_resources
Daniel Gultsch
2015-02-01
24
-0
/
+0
|
\
|
*
Remove unused resources
Sam Whited
2015-02-01
24
-0
/
+0
*
|
pulled spanish translations again
iNPUTmice
2015-02-01
1
-2
/
+2
|
/
*
mentioned material theme in changelog
iNPUTmice
2015-02-01
1
-0
/
+1
*
pulled translations from transifex
iNPUTmice
2015-02-01
16
-0
/
+1513
*
Merge pull request #953 from SamWhited/remove_unused_strings
Daniel Gultsch
2015-02-01
4
-7
/
+0
|
\
|
*
Removes some unused strings (the legacy SSL stuff)
Sam Whited
2015-02-01
4
-7
/
+0
|
/
*
fixed text preview for images
iNPUTmice
2015-02-01
1
-1
/
+1
*
Merge pull request #949 from kruks23/title_activity
Daniel Gultsch
2015-02-01
15
-16
/
+2
|
\
|
*
Remove title_activity_conversations and use app_name instead
kruks23
2015-01-30
15
-16
/
+2
|
/
*
made version codes ready for release candidate in beta channel
iNPUTmice
2015-01-29
2
-3
/
+3
*
don't count when attempt failed completly
iNPUTmice
2015-01-29
1
-0
/
+1
*
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2015-01-29
145
-25
/
+105
|
\
|
*
Merge pull request #923 from SamWhited/material-design-icons
Daniel Gultsch
2015-01-29
145
-25
/
+105
|
|
\
|
|
*
Use Material Design Icons on API 21+
Sam Whited
2015-01-29
145
-25
/
+105
|
|
/
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2015-01-29
1
-10
/
+10
|
\
|
|
*
Merge pull request #941 from SamWhited/snackbar_ordering
Daniel Gultsch
2015-01-28
1
-10
/
+10
|
|
\
|
|
*
Show errors before mute snackbar
Sam Whited
2015-01-27
1
-10
/
+10
*
|
|
properly clear notifications. fixed #921
iNPUTmice
2015-01-29
1
-2
/
+8
|
/
/
*
/
fixed broken caps
iNPUTmice
2015-01-28
2
-14
/
+17
|
/
*
muc tics for consistency
iNPUTmice
2015-01-26
1
-1
/
+1
[prev]
[next]