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
*
deduplicate private muc messages
Daniel Gultsch
2015-05-26
1
-1
/
+3
*
update unread count badge only when necessary
Daniel Gultsch
2015-05-26
1
-7
/
+11
*
added default iq handler to print some iq error messages
Daniel Gultsch
2015-05-26
1
-4
/
+16
*
pulled translations from transifex
Daniel Gultsch
2015-05-26
4
-0
/
+20
*
added choose picture as another quick action. fixes #1221
Daniel Gultsch
2015-05-26
28
-1
/
+249
*
renamed OtrEngine to OtrService
Daniel Gultsch
2015-05-26
4
-16
/
+16
*
Merge branch 'master' into development
Daniel Gultsch
2015-05-25
3
-6
/
+13
|
\
|
*
version bump to 1.4.3
1.4.3
Daniel Gultsch
2015-05-25
1
-2
/
+2
|
*
use same sm check inside xmppconnection and out
Daniel Gultsch
2015-05-25
1
-1
/
+1
|
*
log connection age and reshedule ping check
Daniel Gultsch
2015-05-25
1
-4
/
+11
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
Daniel Gultsch
2015-05-21
1
-2
/
+8
|
\
\
|
*
\
Merge pull request #1212 from emdete/add_jid_to_show_location
Daniel Gultsch
2015-05-20
1
-3
/
+8
|
|
\
\
|
|
*
|
fix to detect the sender jid correctly
M. Dietrich
2015-05-20
1
-3
/
+8
|
*
|
|
Merge pull request #1211 from emdete/add_jid_to_show_location
Daniel Gultsch
2015-05-20
1
-0
/
+1
|
|
\
|
|
|
|
*
|
add extra jid to intend "show location"
M. Dietrich
2015-05-20
1
-0
/
+1
*
|
|
|
Merge branch 'master' into development
Daniel Gultsch
2015-05-21
2
-2
/
+2
|
\
\
\
\
|
|
/
/
/
|
/
|
|
/
|
|
|
/
|
|
/
|
|
*
|
version bump to 1.4.2
1.4.2
Daniel Gultsch
2015-05-21
1
-2
/
+2
|
*
|
fixed with attaching wrong files when returning to activity and background se...
Daniel Gultsch
2015-05-21
1
-1
/
+1
*
|
|
added ShortcutBadger as a dependency to create unread counts on launcher icon
Daniel Gultsch
2015-05-20
3
-8
/
+22
*
|
|
pulled translations from transifex
Daniel Gultsch
2015-05-20
7
-0
/
+35
*
|
|
Merge branch 'master' into development
Daniel Gultsch
2015-05-20
2
-6
/
+5
|
\
|
|
|
*
|
don't allow user to accidentally send empty messages
1.4.1
Daniel Gultsch
2015-05-20
2
-6
/
+5
|
*
|
Merge branch 'development'
1.4.0
Daniel Gultsch
2015-05-20
196
-888
/
+2810
|
|
\
\
|
*
|
|
version bump to 1.3.1
1.3.1
Daniel Gultsch
2015-05-02
1
-2
/
+2
|
*
|
|
mark account with incompatible server when no sasl mechansim could be found
Daniel Gultsch
2015-05-02
1
-19
/
+24
|
*
|
|
shut up linter. fixed build
Daniel Gultsch
2015-05-02
1
-1
/
+1
|
*
|
|
Merge tag '1.3.0'
Daniel Gultsch
2015-05-02
198
-461
/
+2996
|
|
\
\
\
|
*
|
|
|
fixed a bug in DNS helper code. fixes #1130
iNPUTmice
2015-04-16
2
-2
/
+2
*
|
|
|
|
proper error parsing. some clean up
Daniel Gultsch
2015-05-20
1
-41
/
+49
*
|
|
|
|
fixed npe in new message parser
Daniel Gultsch
2015-05-20
1
-1
/
+3
*
|
|
|
|
fixed muc mam. added a few security checks
Daniel Gultsch
2015-05-20
2
-25
/
+35
*
|
|
|
|
fixed read/unread markers
Daniel Gultsch
2015-05-20
1
-10
/
+9
*
|
|
|
|
added mam stuff to new message parser
Daniel Gultsch
2015-05-20
3
-9
/
+28
*
|
|
|
|
rewrote parser code. mam id and possible other stuff still missing. also mass...
Daniel Gultsch
2015-05-20
4
-504
/
+230
*
|
|
|
|
provide helper function for getting the content of a child directly
Daniel Gultsch
2015-05-20
6
-21
/
+38
|
|
_
|
/
/
|
/
|
|
|
*
|
|
|
version bump to 1.4.0
Daniel Gultsch
2015-05-20
1
-2
/
+2
*
|
|
|
added fall back package id for voice recorder plugin
Daniel Gultsch
2015-05-20
1
-0
/
+1
*
|
|
|
hide block contact from context menu when server feature is not available fix...
Daniel Gultsch
2015-05-19
1
-2
/
+5
*
|
|
|
use same socket time out for jingle and xmpp connections
Daniel Gultsch
2015-05-18
2
-2
/
+2
*
|
|
|
use a 20s timeout on socks5 connections
Daniel Gultsch
2015-05-18
2
-2
/
+6
*
|
|
|
don't offer initiator his own candidates
Daniel Gultsch
2015-05-18
1
-2
/
+4
*
|
|
|
added changelog for upcoming 1.4.0 release
Daniel Gultsch
2015-05-18
1
-0
/
+7
|
|
_
|
/
|
/
|
|
*
|
|
fixed crash on failed account registry
Daniel Gultsch
2015-05-17
1
-1
/
+1
*
|
|
made white space check in bodyContainsDownloadable less aggresive
Daniel Gultsch
2015-05-16
1
-1
/
+1
*
|
|
version bump to 1.4.0-beta
Daniel Gultsch
2015-05-16
1
-2
/
+2
*
|
|
pulled new translations from transifex
Daniel Gultsch
2015-05-16
3
-52
/
+302
*
|
|
let jingle connection and manager handle message status
Daniel Gultsch
2015-05-16
3
-4
/
+10
*
|
|
call StartConversationActivity in init mode only after adding the first account
Daniel Gultsch
2015-05-15
2
-2
/
+6
*
|
|
Force Nameprepping of JID domain parts
Andreas Straub
2015-05-14
2
-4
/
+96
*
|
|
added a few location questions
Daniel Gultsch
2015-05-14
1
-3
/
+8
[next]