Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | fixed private messages | iNPUTmice | 2014-11-09 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #644 from SamWhited/barejidchecks | Daniel Gultsch | 2014-11-09 | 5 | -7/+7 | |
|\ \ \ | | | | | | | | | s/getResourcepart().isEmpty()/isBareJid()/ [EOM] | |||||
| * | | | s/getResourcepart().isEmpty()/isBareJid()/ | Sam Whited | 2014-11-09 | 5 | -7/+7 | |
|/ / / | ||||||
* | | | use isBareJid instead of getResourcePart().isEmpty() | iNPUTmice | 2014-11-09 | 2 | -2/+2 | |
| | | | ||||||
* | | | fixed muc sender history for some cases (where the previous nick was a valid ↵ | iNPUTmice | 2014-11-09 | 2 | -8/+17 | |
| | | | | | | | | | | | | jid) | |||||
* | | | migrated some otr stuff to new jid classes | iNPUTmice | 2014-11-09 | 2 | -79/+82 | |
| | | | ||||||
* | | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-09 | 28 | -110/+103 | |
|\ \ \ | | | | | | | | | | | | | development | |||||
| * \ \ | Merge pull request #642 from SamWhited/accountgetjid | Daniel Gultsch | 2014-11-09 | 27 | -106/+102 | |
| |\ \ \ | | | | | | | | | | | Rework `Account.getJid()' to return full JIDs | |||||
| | * | | | Rework `Account.getJid()' to return full JIDs | Sam Whited | 2014-11-09 | 27 | -106/+102 | |
| | | | | | | | | | | | | | | | | | | | | Remove `Account.getFullJid()' | |||||
| * | | | | Merge pull request #643 from SamWhited/idndependfix | Daniel Gultsch | 2014-11-09 | 1 | -4/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | Remove unused dependency | |||||
| | * | | | | 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 | |||||
| * | | | 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 | |
|\ \ \ | |/ / |/| | | Use JID class instead of strings | |||||
| * | | 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 + changelog0.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 |