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
/
eu
/
siacs
/
conversations
/
ui
/
ConversationFragment.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Show errors before mute snackbar
Sam Whited
2015-01-27
1
-10
/
+10
*
otr: switch to the otr-state the partner alternate.
Michael
2015-01-25
1
-0
/
+1
*
always allow access to contact details. provide add button in contact details
iNPUTmice
2015-01-21
1
-8
/
+1
*
Add block/unblock to contact details menu
Sam Whited
2015-01-21
1
-3
/
+0
*
Add option to swap enter/emoticon key
Sam Whited
2015-01-14
1
-5
/
+15
*
context menu for files and offered files. fixed #848 fixed #849
Daniel Gultsch
2015-01-12
1
-13
/
+21
*
Add XEP-0245 (/me command) support
Sam Whited
2015-01-11
1
-5
/
+5
*
Introduced expert options to control enter-is-send
Daniel Gultsch
2015-01-09
1
-2
/
+7
*
some further otr improvements
Daniel Gultsch
2015-01-02
1
-0
/
+2
*
allow cancellation of waiting files
Daniel Gultsch
2015-01-02
1
-19
/
+19
*
put Conversations into background mode earlier
Daniel Gultsch
2015-01-02
1
-2
/
+1
*
improved OTR verification part one
Daniel Gultsch
2015-01-02
1
-8
/
+12
*
proper call to invalidateViews()
Daniel Gultsch
2014-12-25
1
-1
/
+1
*
Add support for XEP-0191 (Blocking command)
Sam Whited
2014-12-22
1
-87
/
+104
*
inject ui callback into running mam query
iNPUTmice
2014-12-20
1
-2
/
+1
*
clean up conversation history after swtiching to a different conversation
iNPUTmice
2014-12-17
1
-0
/
+1
*
made scroling smoother + bug fixes for history loading
iNPUTmice
2014-12-17
1
-15
/
+36
*
smoothed out scrolling a bit
iNPUTmice
2014-12-17
1
-5
/
+23
*
go through mam history page by page. load mam dynamically on scroll
iNPUTmice
2014-12-15
1
-8
/
+28
*
refactored the way certain messages are being found within a conversation
iNPUTmice
2014-12-14
1
-18
/
+11
*
worked around concurrent modification exception
iNPUTmice
2014-12-03
1
-11
/
+11
*
clear encrypted messages on reinit
iNPUTmice
2014-12-01
1
-2
/
+13
*
brought ad hoc conferences back. fixed #688 fixed #367
iNPUTmice
2014-11-20
1
-1
/
+1
*
synchronized message list in conversation fragment
iNPUTmice
2014-11-18
1
-113
/
+118
*
properly remove conversations context menu
iNPUTmice
2014-11-18
1
-4
/
+1
*
better usage of synchronized in some places
iNPUTmice
2014-11-18
1
-1
/
+1
*
context menu for muc participants + refactor trueCounterpart to use Jid class
iNPUTmice
2014-11-17
1
-0
/
+3
*
Make account status an enum
Sam Whited
2014-11-15
1
-2
/
+2
*
Merge branch 'feature/file_transfer' into development
iNPUTmice
2014-11-15
1
-1
/
+26
|
\
|
*
handled more error cases
iNPUTmice
2014-11-15
1
-0
/
+9
|
*
fixed description in notifications and conversation overview
iNPUTmice
2014-11-15
1
-1
/
+2
|
*
made file transfers cancelable
iNPUTmice
2014-11-15
1
-1
/
+16
*
|
added snackbar to indicate smp. more error handling in verify activity
iNPUTmice
2014-11-11
1
-66
/
+59
*
|
initial smp support
iNPUTmice
2014-11-11
1
-9
/
+7
|
/
*
more refactoring for presence selection. removed getTo, getFrom and getJid fr...
iNPUTmice
2014-11-10
1
-14
/
+9
*
use isBareJid instead of getResourcePart().isEmpty()
iNPUTmice
2014-11-09
1
-1
/
+1
*
fixed muc sender history for some cases (where the previous nick was a valid ...
iNPUTmice
2014-11-09
1
-4
/
+5
*
Rework `Account.getJid()' to return full JIDs
Sam Whited
2014-11-09
1
-1
/
+1
*
refactored code to always contain full jid for counterpart
iNPUTmice
2014-11-09
1
-14
/
+12
*
Fix contact highlighting in MUC
Sam Whited
2014-11-09
1
-2
/
+2
*
Update another chunk of stuff to use JID objects
Sam Whited
2014-11-09
1
-9
/
+8
*
bug fixes for the previous ui refactoring
iNPUTmice
2014-11-07
1
-1
/
+0
*
UI code refactoring
iNPUTmice
2014-11-07
1
-118
/
+79
*
link to account details when touching own avatar
iNPUTmice
2014-11-04
1
-118
/
+124
*
Merge branch 'gradle' into development
Sam Whited
2014-10-30
1
-8
/
+119
*
Make conversations the root project
Sam Whited
2014-10-22
1
-0
/
+781