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
*
avoid using paragraph style breaks by accident
Daniel Gultsch
2015-05-11
2
-4
/
+7
*
increased space between merged messages a bit
Daniel Gultsch
2015-05-11
1
-1
/
+1
*
add a little bit of space between merged messages.
Daniel Gultsch
2015-05-11
2
-2
/
+8
*
no font padding on red hearts
Daniel Gultsch
2015-05-11
1
-2
/
+4
*
rewrote parts of message adapter to avoid using NULL views
Daniel Gultsch
2015-05-11
3
-54
/
+41
*
optimized heart render code a bit
Daniel Gultsch
2015-05-10
2
-7
/
+8
*
added white heart to new rendering as well
Daniel Gultsch
2015-05-10
2
-1
/
+4
*
Merge branch 'development' of github.com:siacs/Conversations into development
Daniel Gultsch
2015-05-10
1
-1
/
+5
|
\
|
*
only forward incoming chat messages to Pebble App and Gadgetbridge
Andreas Shimokawa
2015-05-08
1
-1
/
+5
*
|
changed conversation red to material red
Daniel Gultsch
2015-05-10
1
-2
/
+2
*
|
paint single unicode hearts as red and slightly larger
Daniel Gultsch
2015-05-10
3
-36
/
+66
|
/
*
config option to reset attempt counts when changing network (default=true)
Daniel Gultsch
2015-05-08
2
-8
/
+19
*
throw proper exception before changing account into error state
Daniel Gultsch
2015-05-08
1
-11
/
+31
*
fixed encrypted ibb file transfer which was broken with ART. fixes #1172
Daniel Gultsch
2015-05-07
2
-26
/
+33
*
fixed npe when binval value of vcard avatar is null
Daniel Gultsch
2015-05-07
1
-2
/
+3
*
fixed npe when missing instructions on failed register
Daniel Gultsch
2015-05-06
1
-7
/
+5
*
fwiw don't allow stanza count to go over MAX_INT
Daniel Gultsch
2015-05-06
1
-0
/
+9
*
avoid fetching avatars multiple times in parallel
Daniel Gultsch
2015-05-05
1
-8
/
+39
*
r/o support for vcard avatars. pep avatars will be prefered
Daniel Gultsch
2015-05-05
6
-28
/
+127
*
enabled sm logging by default at least for development branch
Daniel Gultsch
2015-05-05
1
-1
/
+1
*
clean up in attachment chooser code. fixed #1168
Daniel Gultsch
2015-05-04
1
-51
/
+51
*
open market if share location plugin isn't installed
Daniel Gultsch
2015-05-04
1
-0
/
+15
*
Fix typos in URL to the project
Alexander Groshev
2015-05-03
1
-2
/
+2
*
turn send button in cancel button while in whisper mode
Daniel Gultsch
2015-05-03
1
-12
/
+30
*
mark account with incompatible server when no sasl mechansim could be found
Daniel Gultsch
2015-05-02
1
-19
/
+24
*
replace send button with quick action button as long as no text has been entered
Daniel Gultsch
2015-05-02
2
-106
/
+192
*
added config option to be a bit more verbose about stanza counts
Daniel Gultsch
2015-04-29
2
-4
/
+15
*
npe check after reading image uri
Daniel Gultsch
2015-04-28
1
-3
/
+3
*
made material icons smaller (24dp)
Daniel Gultsch
2015-04-28
2
-3
/
+3
*
stop conference details from crashing when rotating the screen
Daniel Gultsch
2015-04-28
1
-0
/
+3
*
fixed npe when rotating screen in contact details activity
Daniel Gultsch
2015-04-28
1
-4
/
+8
*
print stack trace on io error
Daniel Gultsch
2015-04-28
1
-6
/
+6
*
escape nick in highlight regex pattern
Daniel Gultsch
2015-04-28
1
-1
/
+1
*
revert undo timeout to a more reasonable value
Daniel Gultsch
2015-04-28
1
-1
/
+1
*
handle returning from camera without picture
Daniel Gultsch
2015-04-27
1
-0
/
+3
*
use xmppserviceconnection to send iq packets in jingle connection
Daniel Gultsch
2015-04-26
1
-4
/
+4
*
hard code bitmap configs
Daniel Gultsch
2015-04-26
1
-2
/
+2
*
Merge pull request #1135 from BrianBlade/manage_certificates
Daniel Gultsch
2015-04-25
1
-0
/
+91
|
\
|
*
Add option to remove manually approved certificates
BrianBlade
2015-04-19
1
-0
/
+91
*
|
fixed service discovery by properly storing and checking identities
Daniel Gultsch
2015-04-25
3
-30
/
+50
*
|
fixed #1039
Daniel Gultsch
2015-04-25
1
-0
/
+3
*
|
Merge pull request #1146 from BrianBlade/minor_otr_tweaks
Daniel Gultsch
2015-04-25
3
-6
/
+17
|
\
\
|
*
|
OTR: Fix onContactStatusChanged & dont archive OTR
BrianBlade
2015-04-21
3
-6
/
+17
*
|
|
cleaned up file handling
Daniel Gultsch
2015-04-25
3
-71
/
+87
*
|
|
send invite to other instanzes after creating ad hoc conference. fixes #1136
Daniel Gultsch
2015-04-23
1
-0
/
+8
*
|
|
fixed direct invites
Daniel Gultsch
2015-04-21
1
-12
/
+28
|
/
/
*
|
always hide pgp snackbar after decrypting a message. fixes #1075
Daniel Gultsch
2015-04-20
1
-0
/
+1
*
|
removed some dead code
Daniel Gultsch
2015-04-20
1
-19
/
+0
*
|
fixed weird touch on snackbar switched conversation bug
Daniel Gultsch
2015-04-20
1
-3
/
+2
*
|
some code clean up to fix some rare NPE’s
Daniel Gultsch
2015-04-19
2
-4
/
+7
|
/
[next]