aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* catch another exception in fingerprint generationDaniel Gultsch2014-12-251-1/+1
* Merge pull request #810 from kriztan/patch-2Daniel Gultsch2014-12-251-0/+20
|\
| * Update german translationskriztan2014-12-251-0/+20
* | Merge pull request #809 from pulser/server-info-fixDaniel Gultsch2014-12-251-2/+4
|\ \ | |/ |/|
| * Show server info option when blocking is unavailablepulser2014-12-241-2/+4
|/
* Merge pull request #807 from SamWhited/developmentDaniel Gultsch2014-12-231-0/+8
|\
| * Don't allow user to register domain only jidsSam Whited2014-12-231-0/+5
| * Don't show menu on create account screenSam Whited2014-12-231-0/+3
|/
* Merge pull request #805 from SamWhited/removeoldvalidatorDaniel Gultsch2014-12-233-105/+77
|\
| * Remove old JID validatorSam Whited2014-12-233-105/+77
|/
* Merge pull request #804 from SamWhited/server-infoDaniel Gultsch2014-12-234-6/+150
|\
| * Add more server compatibility info.Sam Whited2014-12-234-6/+150
|/
* Merge branch 'SamWhited-verifyServerIqs' into developmentiNPUTmice2014-12-235-124/+102
|\
| * made method private that is no longer required to be publiciNPUTmice2014-12-231-1/+1
| * Simplify roster handling codeSam Whited2014-12-223-121/+97
| * Merge pull request #802 from SamWhited/blockingfixDaniel Gultsch2014-12-222-2/+4
|/|
| * Fix NPEs in blocking codeSam Whited2014-12-222-2/+4
|/
* Merge pull request #796 from SamWhited/xep0191Daniel Gultsch2014-12-2244-904/+1485
|\
| * Add support for XEP-0191 (Blocking command)Sam Whited2014-12-2244-904/+1485
|/
* updated readme and xep listiNPUTmice2014-12-212-2/+4
* get rid of special self presence object and incorporate that into rosteriNPUTmice2014-12-203-75/+46
* more null checks for otr fingerprintsiNPUTmice2014-12-201-1/+1
* don't include empty fingerprints in list of otrfingerprintsiNPUTmice2014-12-201-4/+6
* fixed another break continue bugiNPUTmice2014-12-201-3/+2
* inject ui callback into running mam queryiNPUTmice2014-12-203-4/+6
* Merge pull request #794 from svetlemodry/developmentDaniel Gultsch2014-12-201-2/+2
|\
| * Czech image transfer string fixJaroslav Lichtblau2014-12-191-2/+2
* | Merge pull request #797 from kruks23/translationDaniel Gultsch2014-12-201-4/+12
|\ \
| * | Update spanish translationskruks232014-12-201-4/+12
|/ /
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-192-0/+16
|\ \
| * | Merge pull request #789 from svetlemodry/developmentDaniel Gultsch2014-12-191-0/+8
| |\|
| | * Czech translation updatedJaroslav Lichtblau2014-12-181-0/+8
| |/
| * Merge pull request #787 from kriztan/patch-1Daniel Gultsch2014-12-181-0/+8
| |\
| | * Update german translationskriztan2014-12-181-0/+8
| |/
* / fixed #755iNPUTmice2014-12-191-1/+1
|/
* clean up conversation history after swtiching to a different conversationiNPUTmice2014-12-173-4/+12
* show error if jid couldn't be parsed in new contact dialogiNPUTmice2014-12-171-15/+10
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-173-18/+19
|\
| * Merge pull request #783 from SamWhited/quiet-hoursDaniel Gultsch2014-12-173-18/+19
| |\
| | * Handle time comparisons using longsSam Whited2014-12-162-13/+8
| | * Update summary in TimePreference change listenerSam Whited2014-12-151-5/+11
* | | made scroling smoother + bug fixes for history loadingiNPUTmice2014-12-174-21/+48
* | | smoothed out scrolling a bitiNPUTmice2014-12-173-23/+45
|/ /
* | properly detect images in share withiNPUTmice2014-12-171-6/+6
* | Merge branch 'issue756' of https://github.com/SamWhited/Conversations into Sa...iNPUTmice2014-12-172-25/+37
|\ \
| * | Allow sending of any filetype via intentSam Whited2014-12-152-25/+37
| |/
* / properly count mam messagesiNPUTmice2014-12-172-4/+13
|/
* go through mam history page by page. load mam dynamically on scrolliNPUTmice2014-12-155-43/+108
* Merge pull request #782 from SamWhited/quiet-hoursDaniel Gultsch2014-12-151-3/+3
|\
| * Make some magic number constants finalSam Whited2014-12-151-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 06:34:16 +0000