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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
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
*
timestamp parsing reverted
steckbrief
2015-03-31
1
-5
/
+20
*
Configurable LED color (Attention: Expert setting because currently only text...
steckbrief
2015-03-31
3
-1
/
+17
*
Changes for emoticon parser reactivated
steckbrief
2015-03-31
2
-6
/
+8
*
Merge tag '1.2.0' into trz/master
steckbrief
2015-03-30
82
-610
/
+2937
|
\
|
*
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
|
*
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
|
*
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
|
*
|
|
|
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
|
*
|
|
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
6
-0
/
+25
|
*
|
|
show geo uris as 'location' in overview
iNPUTmice
2015-03-10
2
-1
/
+9
|
|
|
/
|
|
/
|
|
*
|
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
7
-53
/
+230
|
|
/
/
|
*
|
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
|
*
pulled new translations from transifex
iNPUTmice
2015-02-27
5
-23
/
+191
|
*
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
[next]