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
*
Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference
steckbrief
2015-06-19
1
-2
/
+4
*
Status color added to "create conversation" (refers to ticket #22 in flyspray)
steckbrief
2015-06-19
6
-2
/
+42
*
moved color picker to libs
lookshe
2015-04-15
37
-31
/
+219
*
changed received and read confirmation setting to one list and put it to sett...
lookshe
2015-04-14
10
-83
/
+110
*
adjusted todo
lookshe
2015-04-14
1
-0
/
+1
*
check with lowercase to also match JPEG, JPeg ...
lookshe
2015-04-13
1
-1
/
+1
*
adjusted todo
lookshe
2015-04-13
1
-0
/
+1
*
changed last message in overview also to EmojiconTextView for displaying smil...
lookshe
2015-04-12
2
-4
/
+9
*
adjusted todo
lookshe
2015-04-12
1
-2
/
+0
*
better and perhaps faster way for checking if a message is downloadable
lookshe
2015-04-12
1
-10
/
+18
*
new settings to initialisation of Settings
lookshe
2015-04-12
1
-1
/
+1
*
implementation for downloading only when enabled wlan
lookshe
2015-04-12
4
-3
/
+30
*
added settings for accepting and downloading files
lookshe
2015-04-12
24
-29
/
+77
*
add missing resource files
lookshe
2015-04-12
8
-0
/
+0
*
Merge remote-tracking branch 'origin/trz/master' into trz/master
lookshe
2015-04-12
1
-3
/
+1
|
\
|
*
adjusted todo
lookshe
2015-04-12
1
-3
/
+1
*
|
whatsapp-like smiley implementation
lookshe
2015-04-12
1026
-27
/
+4231
*
|
whatsapp-like smiley implemantation
lookshe
2015-04-12
1
-1
/
+2
|
/
*
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...
steckbrief
2015-04-11
7
-22
/
+38
|
\
|
*
show online status under avatar in same way for muc as the send button does
lookshe
2015-04-11
1
-13
/
+18
|
*
differ between received and read message
lookshe
2015-04-11
6
-9
/
+20
*
|
Color choose dialog
steckbrief
2015-04-11
26
-15
/
+688
|
/
*
no trim of messages or password
lookshe
2015-04-11
7
-9
/
+15
*
correct parsing of led color
lookshe
2015-04-11
1
-1
/
+1
*
todo added
lookshe
2015-04-11
1
-0
/
+1
*
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...
lookshe
2015-04-11
88
-635
/
+3322
|
\
|
*
timestamp parsing reverted
steckbrief
2015-03-31
2
-16
/
+31
|
*
Configurable LED color (Attention: Expert setting because currently only text...
steckbrief
2015-03-31
4
-3
/
+19
|
*
Changes for emoticon parser reactivated
steckbrief
2015-03-31
5
-8
/
+290
|
*
Merge tag '1.2.0' into trz/master
steckbrief
2015-03-30
86
-617
/
+2991
|
|
\
|
|
*
bump version code
1.2.0
iNPUTmice
2015-03-22
1
-2
/
+2
|
|
*
pulled translations
iNPUTmice
2015-03-22
5
-0
/
+21
|
|
*
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
|
|
*
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2015-03-20
1
-1
/
+1
|
|
|
\
|
|
|
*
Update CHANGELOG.md
Daniel Gultsch
2015-03-19
1
-1
/
+1
|
|
*
|
wait for session iq to return sucessfully before sending other stanzas. fixed...
iNPUTmice
2015-03-20
1
-26
/
+42
|
|
|
/
|
|
*
version bump to 1.2.0-beta
1.2.0-beta
iNPUTmice
2015-03-19
2
-3
/
+5
|
|
*
don't update presence for muc messages
iNPUTmice
2015-03-19
1
-5
/
+2
|
|
*
pulled more translations
iNPUTmice
2015-03-19
1
-0
/
+5
|
|
*
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
4
-6
/
+134
|
|
|
\
\
|
|
|
*
|
Added multiple select to Choose Contact Activity
Andreas Straub
2015-03-18
4
-6
/
+134
|
|
*
|
|
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
|
|
*
|
|
|
Merge pull request #1041 from weiss/fix-cached-avatar-size
Daniel Gultsch
2015-03-17
1
-29
/
+31
|
|
|
\
\
\
\
|
|
|
|
_
|
/
/
|
|
|
/
|
|
|
|
|
|
*
|
|
Set file size also for cached avatars
Holger Weiß
2015-03-17
1
-29
/
+31
|
|
|
/
/
/
|
|
*
|
|
pulled new translations from transifex
iNPUTmice
2015-03-16
10
-11
/
+348
|
|
*
|
|
updated changelong
iNPUTmice
2015-03-11
1
-0
/
+9
[next]