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
*
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-11-09
28
-110
/
+103
|
\
|
*
Merge pull request #642 from SamWhited/accountgetjid
Daniel Gultsch
2014-11-09
27
-106
/
+102
|
|
\
|
|
*
Rework `Account.getJid()' to return full JIDs
Sam Whited
2014-11-09
27
-106
/
+102
|
*
|
Merge pull request #643 from SamWhited/idndependfix
Daniel Gultsch
2014-11-09
1
-4
/
+1
|
|
\
\
|
|
*
|
Remove unused dependency
Sam Whited
2014-11-09
1
-4
/
+1
|
|
/
/
*
|
|
Merge branch 'master' into development
iNPUTmice
2014-11-09
1
-14
/
+22
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
make avatar service not break on empty names
iNPUTmice
2014-11-09
1
-14
/
+22
*
|
|
fixed null pointer in message merger
iNPUTmice
2014-11-09
1
-0
/
+1
|
|
/
|
/
|
*
|
refactored code to always contain full jid for counterpart
iNPUTmice
2014-11-09
8
-86
/
+84
*
|
fixed full jid for account
iNPUTmice
2014-11-09
1
-80
/
+76
*
|
return null if from ist not set in abstract stanza
iNPUTmice
2014-11-09
1
-12
/
+17
*
|
Merge pull request #641 from kruks23/translation8
Daniel Gultsch
2014-11-09
1
-1
/
+21
|
\
\
|
*
|
Update Spanish Translations
kruks23
2014-11-09
1
-1
/
+21
|
|
/
*
|
Merge pull request #639 from SamWhited/issue631
Daniel Gultsch
2014-11-09
51
-784
/
+1154
|
\
\
|
|
/
|
/
|
|
*
Check for illegal arguments to the toASCII func
Sam Whited
2014-11-09
2
-3
/
+17
|
*
Fix contact highlighting in MUC
Sam Whited
2014-11-09
1
-2
/
+2
|
*
Fix issue with IDN SRV records
Sam Whited
2014-11-09
1
-2
/
+3
|
*
Fix crash on account creation
Sam Whited
2014-11-09
1
-13
/
+2
|
*
Don't crash on packets with no "from" specified
Sam Whited
2014-11-09
1
-1
/
+2
|
*
Create avatar's for JID's w/o localparts
Sam Whited
2014-11-09
4
-29
/
+13
|
*
Fields that we sync on should be final
Sam Whited
2014-11-09
1
-1
/
+1
|
*
Fix bug introduced by rebase
Sam Whited
2014-11-09
1
-5
/
+4
|
*
Fix letter avatar selection in MUC
Sam Whited
2014-11-09
2
-13
/
+2
|
*
More formatting fixes in MUC
Sam Whited
2014-11-09
1
-1
/
+5
|
*
Format contact names in MUC properly
Sam Whited
2014-11-09
2
-24
/
+27
|
*
Fix JID parsing error
Sam Whited
2014-11-09
1
-1
/
+1
|
*
It builds again!
Sam Whited
2014-11-09
4
-19
/
+14
|
*
Add a packet JID place I missed...
Sam Whited
2014-11-09
1
-1
/
+1
|
*
Update more files to use JID objects
Sam Whited
2014-11-09
14
-54
/
+102
|
*
Update another chunk of stuff to use JID objects
Sam Whited
2014-11-09
9
-83
/
+104
|
*
Update more files to use JID objects
Sam Whited
2014-11-09
12
-115
/
+179
|
*
Move a chunk of classes over to using JID objects
Sam Whited
2014-11-09
22
-475
/
+526
|
*
Use factories to generate JIDs
Sam Whited
2014-11-09
1
-18
/
+22
|
*
Improve JID error handling
Sam Whited
2014-11-09
2
-9
/
+57
|
*
Add first attempt at JID class
Sam Whited
2014-11-09
1
-0
/
+151
|
*
Add jxmpp-stringprep-libidn dependency
Sam Whited
2014-11-09
1
-2
/
+6
|
/
*
bumped gradle files + changelog
0.8.3
iNPUTmice
2014-11-09
2
-2
/
+6
*
version bump to 0.8.3 + changelog
iNPUTmice
2014-11-09
1
-1
/
+1
*
fixed #634
iNPUTmice
2014-11-09
1
-2
/
+2
*
use proper theme for MTM
iNPUTmice
2014-11-09
1
-4
/
+8
*
got rid of MTM and mRandom variable in favor of using a reference to service
iNPUTmice
2014-11-09
1
-12
/
+7
*
check if socket was null before doing ssl connect
iNPUTmice
2014-11-08
2
-47
/
+42
*
update conversation fragment on every backend connect
iNPUTmice
2014-11-08
1
-2
/
+3
*
Merge pull request #549 from emdete/p2
Daniel Gultsch
2014-11-08
1
-3
/
+7
|
\
|
*
adjust api level wrapping
M. Dietrich
2014-11-04
1
-3
/
+7
*
|
bug fixes for the previous ui refactoring
iNPUTmice
2014-11-07
3
-27
/
+20
*
|
UI code refactoring
iNPUTmice
2014-11-07
3
-253
/
+172
*
|
fixed #633
iNPUTmice
2014-11-06
1
-24
/
+26
*
|
don't show avatar on initial account creation
iNPUTmice
2014-11-06
1
-2
/
+4
*
|
linked conference
iNPUTmice
2014-11-06
1
-1
/
+1
[next]