kriztan
|
b971965697
|
Update German language
|
2014-11-12 13:13:59 +01:00 |
|
|
iNPUTmice
|
f1e2be4096
|
check if account is online before doing smp
|
2014-11-12 12:45:59 +01:00 |
|
|
iNPUTmice
|
52ca2e7391
|
Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification
Conflicts:
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
|
2014-11-11 17:45:16 +01:00 |
|
|
iNPUTmice
|
d1bf9a3f6d
|
use auto register for verify otr listeners
|
2014-11-11 17:42:09 +01:00 |
|
|
iNPUTmice
|
76f4cf1a73
|
small bug fix
|
2014-11-11 17:40:51 +01:00 |
|
|
iNPUTmice
|
e33fc26cbe
|
added snackbar to indicate smp. more error handling in verify activity
|
2014-11-11 17:40:51 +01:00 |
|
|
iNPUTmice
|
6cd2ff0d88
|
initial smp support
|
2014-11-11 17:40:51 +01:00 |
|
|
iNPUTmice
|
e555fe4b03
|
auto register/unregister listeners
|
2014-11-11 17:39:28 +01:00 |
|
|
iNPUTmice
|
fce78abb1c
|
temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds
|
2014-11-11 00:16:43 +01:00 |
|
|
iNPUTmice
|
8cb97f517f
|
small bug fix
|
2014-11-10 23:47:04 +01:00 |
|
|
iNPUTmice
|
dc98b3dbd5
|
added snackbar to indicate smp. more error handling in verify activity
|
2014-11-10 22:03:23 +01:00 |
|
|
iNPUTmice
|
8740b55d37
|
initial smp support
|
2014-11-10 19:23:54 +01:00 |
|
|
iNPUTmice
|
c8a6b05163
|
made Jid class parse otr session ids
|
2014-11-10 11:37:31 +01:00 |
|
|
iNPUTmice
|
89ee999e1b
|
more refactoring for presence selection. removed getTo, getFrom and getJid from Element
|
2014-11-10 01:24:35 +01:00 |
|
|
iNPUTmice
|
26b4788733
|
formating
|
2014-11-09 21:27:37 +01:00 |
|
|
Daniel Gultsch
|
a01ff66537
|
Merge pull request #645 from betheg/about_all_libs
add all used libs to the pref_about_message
|
2014-11-09 21:18:32 +01:00 |
|
|
iNPUTmice
|
72068d1a26
|
fixed private messages
|
2014-11-09 21:14:37 +01:00 |
|
|
Michael
|
b1da9ae3cc
|
add libidn to pref_about_message.
|
2014-11-09 21:02:35 +01:00 |
|
|
Daniel Gultsch
|
a45a343604
|
Merge pull request #644 from SamWhited/barejidchecks
s/getResourcepart().isEmpty()/isBareJid()/ [EOM]
|
2014-11-09 20:05:38 +01:00 |
|
|
Sam Whited
|
385bea0fe3
|
s/getResourcepart().isEmpty()/isBareJid()/
|
2014-11-09 13:13:19 -05:00 |
|
|
iNPUTmice
|
56b4ac1751
|
use isBareJid instead of getResourcePart().isEmpty()
|
2014-11-09 19:06:43 +01:00 |
|
|
iNPUTmice
|
eb9e988361
|
fixed muc sender history for some cases (where the previous nick was a valid jid)
|
2014-11-09 18:24:01 +01:00 |
|
|
iNPUTmice
|
69ef17efc0
|
migrated some otr stuff to new jid classes
|
2014-11-09 17:46:00 +01:00 |
|
|
iNPUTmice
|
c310ada8b3
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-09 17:05:20 +01:00 |
|
|
Daniel Gultsch
|
cb1a36da79
|
Merge pull request #642 from SamWhited/accountgetjid
Rework `Account.getJid()' to return full JIDs
|
2014-11-09 17:06:09 +01:00 |
|
|
Daniel Gultsch
|
44de982877
|
Merge pull request #643 from SamWhited/idndependfix
Remove unused dependency
|
2014-11-09 17:04:47 +01:00 |
|
|
Sam Whited
|
0aa6efe444
|
Remove unused dependency
|
2014-11-09 11:03:22 -05:00 |
|
|
iNPUTmice
|
e9af0d4ca7
|
Merge branch 'master' into development
|
2014-11-09 17:02:49 +01:00 |
|
|
iNPUTmice
|
61f046a675
|
make avatar service not break on empty names
|
2014-11-09 17:02:39 +01:00 |
|
|
Sam Whited
|
180a0e4408
|
Rework `Account.getJid()' to return full JIDs
Remove `Account.getFullJid()'
|
2014-11-09 10:57:22 -05:00 |
|
|
iNPUTmice
|
ad6fef063b
|
fixed null pointer in message merger
|
2014-11-09 16:47:31 +01:00 |
|
|
iNPUTmice
|
377bd49ee8
|
refactored code to always contain full jid for counterpart
|
2014-11-09 16:21:13 +01:00 |
|
|
iNPUTmice
|
2b99b694eb
|
fixed full jid for account
|
2014-11-09 16:20:36 +01:00 |
|
|
iNPUTmice
|
87c4fd9050
|
return null if from ist not set in abstract stanza
|
2014-11-09 16:18:53 +01:00 |
|
|
Daniel Gultsch
|
8437dbd480
|
Merge pull request #641 from kruks23/translation8
Update Spanish Translations
|
2014-11-09 15:20:25 +01:00 |
|
|
Daniel Gultsch
|
f65a2188cc
|
Merge pull request #639 from SamWhited/issue631
Use JID class instead of strings
|
2014-11-09 15:20:06 +01:00 |
|
|
Sam Whited
|
53c7905631
|
Check for illegal arguments to the toASCII func
|
2014-11-09 09:05:02 -05:00 |
|
|
Michael
|
f146c203a9
|
add all used libs to the pref_about_message.
also improve the notice a bit.
|
2014-11-09 13:59:38 +01:00 |
|
|
kruks23
|
6f6f15d563
|
Update Spanish Translations
|
2014-11-09 13:29:30 +01:00 |
|
|
Sam Whited
|
7cfcf10f48
|
Fix contact highlighting in MUC
|
2014-11-09 07:20:08 -05:00 |
|
|
Sam Whited
|
fc594e9b73
|
Fix issue with IDN SRV records
|
2014-11-09 07:00:40 -05:00 |
|
|
Sam Whited
|
02db197a89
|
Fix crash on account creation
|
2014-11-09 07:00:40 -05:00 |
|
|
Sam Whited
|
cc34c60255
|
Don't crash on packets with no "from" specified
|
2014-11-09 07:00:40 -05:00 |
|
|
Sam Whited
|
1a3327f2b1
|
Create avatar's for JID's w/o localparts
|
2014-11-09 07:00:40 -05:00 |
|
|
Sam Whited
|
5ce0cd3802
|
Fields that we sync on should be final
|
2014-11-09 07:00:40 -05:00 |
|
|
Sam Whited
|
e49c2b14ed
|
Fix bug introduced by rebase
|
2014-11-09 07:00:40 -05:00 |
|
|
Sam Whited
|
778fb9de6c
|
Fix letter avatar selection in MUC
|
2014-11-09 07:00:40 -05:00 |
|
|
Sam Whited
|
efa4cec24d
|
More formatting fixes in MUC
|
2014-11-09 07:00:40 -05:00 |
|
|
Sam Whited
|
dd426ca6de
|
Format contact names in MUC properly
|
2014-11-09 07:00:40 -05:00 |
|
|
Sam Whited
|
1f5908b1d1
|
Fix JID parsing error
|
2014-11-09 07:00:40 -05:00 |
|