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
/
java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
...
*
|
Merge pull request #1099 from BrianBlade/fix_otr_error_msgs
Daniel Gultsch
2015-04-02
2
-18
/
+24
|
\
\
|
*
|
Fix OTR-Error messages
BrianBlade
2015-04-01
2
-18
/
+24
|
|
/
*
/
Add toggle account-state switch
BrianBlade
2015-04-01
2
-16
/
+37
|
/
*
properly set chat states when receiving otr status messages
iNPUTmice
2015-03-21
1
-1
/
+1
*
respond to unreadable OTR messages with error message. fixed #1021
iNPUTmice
2015-03-21
5
-3
/
+42
*
wait for session iq to return sucessfully before sending other stanzas. fixed...
iNPUTmice
2015-03-20
1
-26
/
+42
*
don't update presence for muc messages
iNPUTmice
2015-03-19
1
-5
/
+2
*
Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen
Daniel Gultsch
2015-03-19
4
-8
/
+24
|
\
|
*
# add delivery receipts for private muc msgs
BrianBlade
2015-03-18
4
-8
/
+24
*
|
Merge pull request #1043 from strb/choose_contact_multiple_squashed
Daniel Gultsch
2015-03-18
2
-6
/
+121
|
\
\
|
*
|
Added multiple select to Choose Contact Activity
Andreas Straub
2015-03-18
2
-6
/
+121
*
|
|
Merge pull request #1036 from QuentinC/development
Daniel Gultsch
2015-03-18
1
-1
/
+1
|
\
\
\
|
*
|
|
Green led color is better with "full-green"
Quentin
2015-03-04
1
-1
/
+1
*
|
|
|
Set file size also for cached avatars
Holger Weiß
2015-03-17
1
-29
/
+31
|
|
/
/
|
/
|
|
*
|
|
Do not Strigprep JIDs from database
Mateusz "maxmati" Nowoty?ski
2015-03-11
4
-11
/
+13
*
|
|
add context menu entries for geo uris
iNPUTmice
2015-03-11
1
-17
/
+33
*
|
|
open location directly from notification
iNPUTmice
2015-03-10
1
-0
/
+25
*
|
|
show geo uris as 'location' in overview
iNPUTmice
2015-03-10
1
-1
/
+7
|
|
/
|
/
|
*
|
Merge pull request #1022 from Boris-de/cipher_blacklist
Daniel Gultsch
2015-03-08
2
-0
/
+25
|
\
\
|
*
|
disable all really weak cipher suites
Boris Wachtmeister
2015-03-07
2
-0
/
+25
*
|
|
display geo uris as location. show 'send loction' in share menu if request lo...
iNPUTmice
2015-03-07
5
-48
/
+215
|
/
/
*
|
fixed enter is send option
iNPUTmice
2015-03-06
2
-6
/
+10
*
|
fixed npe in message parser
iNPUTmice
2015-03-06
1
-4
/
+4
*
|
avoid unnecessary thread creation
iNPUTmice
2015-03-05
3
-17
/
+29
*
|
added config option to disable string prep in jids
iNPUTmice
2015-03-05
2
-3
/
+5
*
|
experimantal in memory jid caching
iNPUTmice
2015-03-04
1
-0
/
+15
|
/
*
added methods to count number of unread messages
Daniel Gultsch
2015-03-02
2
-0
/
+21
*
mark all sent messages up to a marker as displayed
Daniel Gultsch
2015-03-01
2
-13
/
+19
*
merge messages with related status (unsend, send, send_received)
iNPUTmice
2015-03-01
1
-1
/
+17
*
catching out of memory run time exception in hasEnabledAccounts()
iNPUTmice
2015-02-28
1
-0
/
+2
*
use conversations green in notification led
iNPUTmice
2015-02-27
1
-1
/
+1
*
Merge pull request #1006 from QuentinC/development
Daniel Gultsch
2015-02-27
1
-0
/
+1
|
\
|
*
Update NotificationService.java
QuentinC
2015-02-27
1
-1
/
+1
|
*
- Update mBuilder in NotificationService.java to ensure that the led is displ...
Quentin
2015-02-27
1
-1
/
+2
*
|
don't add users with null nicks to muc user list
iNPUTmice
2015-02-27
1
-1
/
+1
*
|
hide change password menu item if server feature is unavailable
iNPUTmice
2015-02-27
1
-7
/
+8
|
/
*
reset error status in edit account when reconnecting
iNPUTmice
2015-02-26
1
-0
/
+4
*
check for null in jid parser
iNPUTmice
2015-02-26
2
-0
/
+3
*
initilize keys with jsonobject value on parse error
iNPUTmice
2015-02-26
1
-1
/
+1
*
prevent next button from showing up too early on account setup
iNPUTmice
2015-02-25
1
-1
/
+1
*
reset incoming chat state when going into background
iNPUTmice
2015-02-23
1
-0
/
+3
*
get rid of some useless debugging
iNPUTmice
2015-02-23
1
-3
/
+0
*
init mode (first start) for StartConversationActivity (no up button) and avoi...
iNPUTmice
2015-02-22
4
-14
/
+44
*
look at 5 muc users instead of 4 for tile cache clearing
iNPUTmice
2015-02-22
1
-2
/
+2
*
properly remove invalid avatar
iNPUTmice
2015-02-22
2
-0
/
+2
*
clear muc tiles cache only when necessary
iNPUTmice
2015-02-21
2
-1
/
+22
*
added typing notifications through XEP-0085. fixed #210
iNPUTmice
2015-02-21
12
-53
/
+256
*
fixed #993
iNPUTmice
2015-02-19
1
-1
/
+2
*
launch edit account activity when starting Conversations for the first time (...
iNPUTmice
2015-02-19
1
-5
/
+9
*
made xmpp uris case insensitive
iNPUTmice
2015-02-18
1
-3
/
+3
[prev]
[next]