aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-0928-110/+103
|\
| * Merge pull request #642 from SamWhited/accountgetjidDaniel Gultsch2014-11-0927-106/+102
| |\
| | * Rework `Account.getJid()' to return full JIDsSam Whited2014-11-0927-106/+102
| * | Merge pull request #643 from SamWhited/idndependfixDaniel Gultsch2014-11-091-4/+1
| |\ \
| | * | Remove unused dependencySam Whited2014-11-091-4/+1
| |/ /
* | | Merge branch 'master' into developmentiNPUTmice2014-11-091-14/+22
|\ \ \ | |/ / |/| |
| * | make avatar service not break on empty namesiNPUTmice2014-11-091-14/+22
* | | fixed null pointer in message mergeriNPUTmice2014-11-091-0/+1
| |/ |/|
* | refactored code to always contain full jid for counterpartiNPUTmice2014-11-098-86/+84
* | fixed full jid for accountiNPUTmice2014-11-091-80/+76
* | return null if from ist not set in abstract stanzaiNPUTmice2014-11-091-12/+17
* | Merge pull request #641 from kruks23/translation8Daniel Gultsch2014-11-091-1/+21
|\ \
| * | Update Spanish Translationskruks232014-11-091-1/+21
| |/
* | Merge pull request #639 from SamWhited/issue631Daniel Gultsch2014-11-0951-784/+1154
|\ \ | |/ |/|
| * Check for illegal arguments to the toASCII funcSam Whited2014-11-092-3/+17
| * Fix contact highlighting in MUCSam Whited2014-11-091-2/+2
| * Fix issue with IDN SRV recordsSam Whited2014-11-091-2/+3
| * Fix crash on account creationSam Whited2014-11-091-13/+2
| * Don't crash on packets with no "from" specifiedSam Whited2014-11-091-1/+2
| * Create avatar's for JID's w/o localpartsSam Whited2014-11-094-29/+13
| * Fields that we sync on should be finalSam Whited2014-11-091-1/+1
| * Fix bug introduced by rebaseSam Whited2014-11-091-5/+4
| * Fix letter avatar selection in MUCSam Whited2014-11-092-13/+2
| * More formatting fixes in MUCSam Whited2014-11-091-1/+5
| * Format contact names in MUC properlySam Whited2014-11-092-24/+27
| * Fix JID parsing errorSam Whited2014-11-091-1/+1
| * It builds again!Sam Whited2014-11-094-19/+14
| * Add a packet JID place I missed...Sam Whited2014-11-091-1/+1
| * Update more files to use JID objectsSam Whited2014-11-0914-54/+102
| * Update another chunk of stuff to use JID objectsSam Whited2014-11-099-83/+104
| * Update more files to use JID objectsSam Whited2014-11-0912-115/+179
| * Move a chunk of classes over to using JID objectsSam Whited2014-11-0922-475/+526
| * Use factories to generate JIDsSam Whited2014-11-091-18/+22
| * Improve JID error handlingSam Whited2014-11-092-9/+57
| * Add first attempt at JID classSam Whited2014-11-091-0/+151
| * Add jxmpp-stringprep-libidn dependencySam Whited2014-11-091-2/+6
|/
* bumped gradle files + changelog0.8.3iNPUTmice2014-11-092-2/+6
* version bump to 0.8.3 + changelogiNPUTmice2014-11-091-1/+1
* fixed #634iNPUTmice2014-11-091-2/+2
* use proper theme for MTMiNPUTmice2014-11-091-4/+8
* got rid of MTM and mRandom variable in favor of using a reference to serviceiNPUTmice2014-11-091-12/+7
* check if socket was null before doing ssl connectiNPUTmice2014-11-082-47/+42
* update conversation fragment on every backend connectiNPUTmice2014-11-081-2/+3
* Merge pull request #549 from emdete/p2Daniel Gultsch2014-11-081-3/+7
|\
| * adjust api level wrappingM. Dietrich2014-11-041-3/+7
* | bug fixes for the previous ui refactoringiNPUTmice2014-11-073-27/+20
* | UI code refactoringiNPUTmice2014-11-073-253/+172
* | fixed #633iNPUTmice2014-11-061-24/+26
* | don't show avatar on initial account creationiNPUTmice2014-11-061-2/+4
* | linked conferenceiNPUTmice2014-11-061-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 13:13:46 +0000