aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #768 from betheg/asDaniel Gultsch2014-12-091-1/+3
|\ \
| * | gradle: fix Cannot set property outputFile on null object.Michael2014-12-091-1/+3
|/ /
* | Merge pull request #710 from betheg/asDaniel Gultsch2014-12-093-17/+15
|\ \
| * | update gradle to 2.2.1 and android gradle plugin to 1.0.0Michael2014-12-092-2/+2
| * | update android gradle plugin to 1.0.0-rc4Michael2014-12-051-1/+1
| * | update android gradle plugin to 0.14.4Michael2014-11-223-17/+15
* | | cleanup: removed unused emoticon parsingiNPUTmice2014-12-094-53/+2
* | | cleanup: removed stream compressioniNPUTmice2014-12-093-205/+0
* | | version bump to 0.9.30.9.3iNPUTmice2014-12-073-3/+5
* | | possible work around for some weird - possibly sdk - bugsiNPUTmice2014-12-071-4/+5
| |/ |/|
* | Merge pull request #752 from SamWhited/update-logoDaniel Gultsch2014-12-041-0/+0
|\ \
| * | Update logo in art folderSam Whited2014-12-041-0/+0
|/ /
* | fixed digest-md5iNPUTmice2014-12-041-0/+4
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-031-1/+1
|\ \
| * \ Merge pull request #746 from SamWhited/developmentDaniel Gultsch2014-12-031-1/+1
| |\ \
| | * | Single character README fix waste of time pull request.Sam Whited2014-12-031-1/+1
* | | | close cursors after querying phone dbiNPUTmice2014-12-031-0/+2
|/ / /
* / / fixed #651iNPUTmice2014-12-032-0/+20
|/ /
* | more safety checks for listener countsiNPUTmice2014-12-031-88/+29
* | updated readmeiNPUTmice2014-12-031-2/+2
* | fixed #544iNPUTmice2014-12-031-1/+51
* | version bump to 0.9.20.9.2iNPUTmice2014-12-033-3/+6
* | display proper error in edit account details if jid is invalidiNPUTmice2014-12-031-8/+9
* | further npe checksiNPUTmice2014-12-032-6/+13
* | refactored the message adapter a bitiNPUTmice2014-12-031-32/+33
* | set nick and autojoin=true for new bookmarksiNPUTmice2014-12-031-0/+4
* | made muc parser more compatible with legacy mucs?! (whatever that is exactly)iNPUTmice2014-12-031-3/+1
* | Merge pull request #744 from SamWhited/developmentDaniel Gultsch2014-12-032-1/+5
|\ \
| * | Make sure SASL tokenizer strips stringsSam Whited2014-12-022-1/+5
|/ /
* | worked around concurrent modification exceptioniNPUTmice2014-12-031-11/+11
* | fixed another npe in hasBookmarkiNPUTmice2014-12-031-2/+3
* | Merge pull request #740 from SamWhited/jidrpfixDaniel Gultsch2014-12-031-163/+165
|\ \
| * | Allow JIDs such as "example.net/@"Sam Whited2014-12-021-3/+2
| * | "example.net/@/" should be a valid JID.Sam Whited2014-12-021-164/+166
| * | Fix RFC 6122 implementationSam Whited2014-12-021-4/+5
* | | Merge pull request #743 from weiss/update-german-translationsDaniel Gultsch2014-12-031-2/+4
|\ \ \
| * | | Update/improve German translationsHolger Weiß2014-12-021-2/+4
| |/ /
* | | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-033-32/+109
|\| |
| * | Merge pull request #737 from kruks23/translation2Daniel Gultsch2014-12-021-9/+11
| |\ \
| | * | Update spanish translationskruks232014-12-011-9/+11
| * | | Merge pull request #730 from svetlemodry/developmentDaniel Gultsch2014-12-022-23/+98
| |\ \ \ | | |/ / | |/| |
| | * | pref_about_message string deletedJaroslav Lichtblau2014-12-011-24/+0
| | * | Added Czech translator nameJaroslav Lichtblau2014-12-011-0/+1
| | * | Updated Czech translation fileJaroslav Lichtblau2014-12-011-23/+121
* | | | safety net in joinMuciNPUTmice2014-12-031-4/+6
* | | | clean up getProposedNickiNPUTmice2014-12-031-6/+5
* | | | fixed potential npes in message parseriNPUTmice2014-12-031-2/+7
* | | | cleaned up avatar / tile creationiNPUTmice2014-12-032-20/+9
|/ / /
* | | fixed #728iNPUTmice2014-12-011-5/+2
* | | bumped cap version as well0.9.1iNPUTmice2014-12-011-1/+1