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
*
Update spanish translations.
kruks23
2014-12-13
1
-33
/
+33
*
removed unnecessary otr error response
iNPUTmice
2014-12-10
2
-12
/
+0
*
recreate activity after theme has changed. fixed #764
iNPUTmice
2014-12-09
2
-3
/
+20
*
Merge pull request #767 from kruks23/translation3
Daniel Gultsch
2014-12-09
1
-6
/
+6
|
\
|
*
Update spanish translations.
kruks23
2014-12-09
1
-6
/
+6
*
|
Merge pull request #768 from betheg/as
Daniel Gultsch
2014-12-09
1
-1
/
+3
|
\
\
|
*
|
gradle: fix Cannot set property outputFile on null object.
Michael
2014-12-09
1
-1
/
+3
|
/
/
*
|
Merge pull request #710 from betheg/as
Daniel Gultsch
2014-12-09
3
-17
/
+15
|
\
\
|
*
|
update gradle to 2.2.1 and android gradle plugin to 1.0.0
Michael
2014-12-09
2
-2
/
+2
|
*
|
update android gradle plugin to 1.0.0-rc4
Michael
2014-12-05
1
-1
/
+1
|
*
|
update android gradle plugin to 0.14.4
Michael
2014-11-22
3
-17
/
+15
*
|
|
cleanup: removed unused emoticon parsing
iNPUTmice
2014-12-09
4
-53
/
+2
*
|
|
cleanup: removed stream compression
iNPUTmice
2014-12-09
3
-205
/
+0
*
|
|
version bump to 0.9.3
0.9.3
iNPUTmice
2014-12-07
3
-3
/
+5
*
|
|
possible work around for some weird - possibly sdk - bugs
iNPUTmice
2014-12-07
1
-4
/
+5
|
|
/
|
/
|
*
|
Merge pull request #752 from SamWhited/update-logo
Daniel Gultsch
2014-12-04
1
-0
/
+0
|
\
\
|
*
|
Update logo in art folder
Sam Whited
2014-12-04
1
-0
/
+0
|
/
/
*
|
fixed digest-md5
iNPUTmice
2014-12-04
1
-0
/
+4
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-12-03
1
-1
/
+1
|
\
\
|
*
\
Merge pull request #746 from SamWhited/development
Daniel Gultsch
2014-12-03
1
-1
/
+1
|
|
\
\
|
|
*
|
Single character README fix waste of time pull request.
Sam Whited
2014-12-03
1
-1
/
+1
*
|
|
|
close cursors after querying phone db
iNPUTmice
2014-12-03
1
-0
/
+2
|
/
/
/
*
/
/
fixed #651
iNPUTmice
2014-12-03
2
-0
/
+20
|
/
/
*
|
more safety checks for listener counts
iNPUTmice
2014-12-03
1
-88
/
+29
*
|
updated readme
iNPUTmice
2014-12-03
1
-2
/
+2
*
|
fixed #544
iNPUTmice
2014-12-03
1
-1
/
+51
*
|
version bump to 0.9.2
0.9.2
iNPUTmice
2014-12-03
3
-3
/
+6
*
|
display proper error in edit account details if jid is invalid
iNPUTmice
2014-12-03
1
-8
/
+9
*
|
further npe checks
iNPUTmice
2014-12-03
2
-6
/
+13
*
|
refactored the message adapter a bit
iNPUTmice
2014-12-03
1
-32
/
+33
*
|
set nick and autojoin=true for new bookmarks
iNPUTmice
2014-12-03
1
-0
/
+4
*
|
made muc parser more compatible with legacy mucs?! (whatever that is exactly)
iNPUTmice
2014-12-03
1
-3
/
+1
*
|
Merge pull request #744 from SamWhited/development
Daniel Gultsch
2014-12-03
2
-1
/
+5
|
\
\
|
*
|
Make sure SASL tokenizer strips strings
Sam Whited
2014-12-02
2
-1
/
+5
|
/
/
*
|
worked around concurrent modification exception
iNPUTmice
2014-12-03
1
-11
/
+11
*
|
fixed another npe in hasBookmark
iNPUTmice
2014-12-03
1
-2
/
+3
*
|
Merge pull request #740 from SamWhited/jidrpfix
Daniel Gultsch
2014-12-03
1
-163
/
+165
|
\
\
|
*
|
Allow JIDs such as "example.net/@"
Sam Whited
2014-12-02
1
-3
/
+2
|
*
|
"example.net/@/" should be a valid JID.
Sam Whited
2014-12-02
1
-164
/
+166
|
*
|
Fix RFC 6122 implementation
Sam Whited
2014-12-02
1
-4
/
+5
*
|
|
Merge pull request #743 from weiss/update-german-translations
Daniel Gultsch
2014-12-03
1
-2
/
+4
|
\
\
\
|
*
|
|
Update/improve German translations
Holger Weiß
2014-12-02
1
-2
/
+4
|
|
/
/
*
|
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-12-03
3
-32
/
+109
|
\
|
|
|
*
|
Merge pull request #737 from kruks23/translation2
Daniel Gultsch
2014-12-02
1
-9
/
+11
|
|
\
\
|
|
*
|
Update spanish translations
kruks23
2014-12-01
1
-9
/
+11
|
*
|
|
Merge pull request #730 from svetlemodry/development
Daniel Gultsch
2014-12-02
2
-23
/
+98
|
|
\
\
\
|
|
|
/
/
|
|
/
|
|
|
|
*
|
pref_about_message string deleted
Jaroslav Lichtblau
2014-12-01
1
-24
/
+0
|
|
*
|
Added Czech translator name
Jaroslav Lichtblau
2014-12-01
1
-0
/
+1
|
|
*
|
Updated Czech translation file
Jaroslav Lichtblau
2014-12-01
1
-23
/
+121
*
|
|
|
safety net in joinMuc
iNPUTmice
2014-12-03
1
-4
/
+6
[next]