Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'development' of https://github.com/siacs/Conversations into dev... | iNPUTmice | 2014-11-09 | 27 | -106/+102 | |
|\ \ \ | ||||||
| * \ \ | 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 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 | |
| |/ / | ||||||
* | | | 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 | |
|/ / | ||||||
* | | 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 | |
* | | version bump to 0.8.20.8.2 | iNPUTmice | 2014-11-06 | 1 | -1/+1 | |
* | | fixed notifications for images | iNPUTmice | 2014-11-05 | 2 | -28/+35 | |
* | | fixed #617 | iNPUTmice | 2014-11-05 | 1 | -26/+22 | |
* | | reformated license a bit | iNPUTmice | 2014-11-04 | 2 | -22/+16 | |
* | | Merge pull request #626 from SamWhited/issue612 | Daniel Gultsch | 2014-11-04 | 2 | -14/+44 | |
|\ \ | ||||||
| * | | Add last seen info to the database | Sam Whited | 2014-11-04 | 2 | -14/+44 | |
| |/ |